From b24687d1617265c0925a75f948cb5ab996f2913a Mon Sep 17 00:00:00 2001
From: Jenkins <jenkins@ring-packaging.cx>
Date: Mon, 17 Oct 2022 22:20:36 -0400
Subject: [PATCH] i18n: automatic bump
Change-Id: Iae4c49f99b775a39665fa109f85b05b43cc3b429
---
translations/lrc_ar.ts | 105 ++++++++-----------
translations/lrc_ar_EG.ts | 105 ++++++++-----------
translations/lrc_az.ts | 105 ++++++++-----------
translations/lrc_be.ts | 105 ++++++++-----------
translations/lrc_be_BY.ts | 105 ++++++++-----------
translations/lrc_bg.ts | 105 ++++++++-----------
translations/lrc_bg_BG.ts | 105 ++++++++-----------
translations/lrc_bn.ts | 105 ++++++++-----------
translations/lrc_ca.ts | 105 ++++++++-----------
translations/lrc_cs_CZ.ts | 107 +++++++++-----------
translations/lrc_da.ts | 105 ++++++++-----------
translations/lrc_da_DK.ts | 99 ++++++++----------
translations/lrc_de.ts | 107 +++++++++-----------
translations/lrc_de_DE.ts | 107 +++++++++-----------
translations/lrc_el.ts | 105 ++++++++-----------
translations/lrc_en.ts | 105 ++++++++-----------
translations/lrc_en_GB.ts | 105 ++++++++-----------
translations/lrc_en_IE.ts | 105 ++++++++-----------
translations/lrc_eo.ts | 107 +++++++++-----------
translations/lrc_es.ts | 107 +++++++++-----------
translations/lrc_es_AR.ts | 107 +++++++++-----------
translations/lrc_es_CO.ts | 107 +++++++++-----------
translations/lrc_es_MX.ts | 107 +++++++++-----------
translations/lrc_et.ts | 105 ++++++++-----------
translations/lrc_et_EE.ts | 105 ++++++++-----------
translations/lrc_eu.ts | 105 ++++++++-----------
translations/lrc_fa.ts | 107 +++++++++-----------
translations/lrc_fa_IR.ts | 107 +++++++++-----------
translations/lrc_fi.ts | 107 +++++++++-----------
translations/lrc_fr.ts | 107 +++++++++-----------
translations/lrc_fr_BE.ts | 107 +++++++++-----------
translations/lrc_fr_CA.ts | 107 +++++++++-----------
translations/lrc_fr_CH.ts | 107 +++++++++-----------
translations/lrc_fr_FR.ts | 107 +++++++++-----------
translations/lrc_ga.ts | 105 ++++++++-----------
translations/lrc_gl.ts | 105 ++++++++-----------
translations/lrc_gu.ts | 105 ++++++++-----------
translations/lrc_he.ts | 107 +++++++++-----------
translations/lrc_hi.ts | 105 ++++++++-----------
translations/lrc_hi_IN.ts | 105 ++++++++-----------
translations/lrc_hr.ts | 107 +++++++++-----------
translations/lrc_hu.ts | 107 +++++++++-----------
translations/lrc_id.ts | 107 +++++++++-----------
translations/lrc_ig.ts | 105 ++++++++-----------
translations/lrc_it.ts | 107 +++++++++-----------
translations/lrc_it_IT.ts | 107 +++++++++-----------
translations/lrc_ja.ts | 107 +++++++++-----------
translations/lrc_kk.ts | 105 ++++++++-----------
translations/lrc_kn.ts | 105 ++++++++-----------
translations/lrc_ko.ts | 105 ++++++++-----------
translations/lrc_ko_KR.ts | 105 ++++++++-----------
translations/lrc_lt.ts | 107 +++++++++-----------
translations/lrc_ml.ts | 105 ++++++++-----------
translations/lrc_mn_MN.ts | 105 ++++++++-----------
translations/lrc_mr.ts | 105 ++++++++-----------
translations/lrc_ms.ts | 107 +++++++++-----------
translations/lrc_nb.ts | 107 +++++++++-----------
translations/lrc_ne.ts | 105 ++++++++-----------
translations/lrc_nl.ts | 107 +++++++++-----------
translations/lrc_nl_BE.ts | 107 +++++++++-----------
translations/lrc_nl_NL.ts | 107 +++++++++-----------
translations/lrc_nn.ts | 105 ++++++++-----------
translations/lrc_oc.ts | 105 ++++++++-----------
translations/lrc_pa.ts | 107 +++++++++-----------
translations/lrc_pl.ts | 107 +++++++++-----------
translations/lrc_pl_PL.ts | 107 +++++++++-----------
translations/lrc_pt.ts | 107 +++++++++-----------
translations/lrc_pt_BR.ts | 107 +++++++++-----------
translations/lrc_pt_PT.ts | 107 +++++++++-----------
translations/lrc_ro.ts | 107 +++++++++-----------
translations/lrc_ro_RO.ts | 107 +++++++++-----------
translations/lrc_ru.ts | 107 +++++++++-----------
translations/lrc_ru_RU.ts | 107 +++++++++-----------
translations/lrc_si.ts | 105 ++++++++-----------
translations/lrc_sk.ts | 107 +++++++++-----------
translations/lrc_sk_SK.ts | 107 +++++++++-----------
translations/lrc_sl.ts | 107 +++++++++-----------
translations/lrc_sq_AL.ts | 107 +++++++++-----------
translations/lrc_sr.ts | 105 ++++++++-----------
translations/lrc_sr@Cyrl.ts | 105 ++++++++-----------
translations/lrc_sr_RS.ts | 105 ++++++++-----------
translations/lrc_sv.ts | 107 +++++++++-----------
translations/lrc_sw.ts | 105 ++++++++-----------
translations/lrc_ta.ts | 105 ++++++++-----------
translations/lrc_te.ts | 105 ++++++++-----------
translations/lrc_th.ts | 105 ++++++++-----------
translations/lrc_tr.ts | 107 +++++++++-----------
translations/lrc_tr_TR.ts | 105 ++++++++-----------
translations/lrc_tt.ts | 105 ++++++++-----------
translations/lrc_uk.ts | 107 +++++++++-----------
translations/lrc_uk_UA.ts | 99 ++++++++----------
translations/lrc_vi.ts | 105 ++++++++-----------
translations/lrc_zh.ts | 107 +++++++++-----------
translations/lrc_zh_CN.ts | 107 +++++++++-----------
translations/lrc_zh_HK.ts | 107 +++++++++-----------
translations/lrc_zh_TW.ts | 107 +++++++++-----------
translations/ring_client_windows.ts | 99 ++++++++----------
translations/ring_client_windows_ar.ts | 103 ++++++++-----------
translations/ring_client_windows_ar_EG.ts | 103 ++++++++-----------
translations/ring_client_windows_az.ts | 99 ++++++++----------
translations/ring_client_windows_be.ts | 99 ++++++++----------
translations/ring_client_windows_be_BY.ts | 99 ++++++++----------
translations/ring_client_windows_bg.ts | 103 ++++++++-----------
translations/ring_client_windows_bg_BG.ts | 103 ++++++++-----------
translations/ring_client_windows_bn.ts | 99 ++++++++----------
translations/ring_client_windows_ca.ts | 101 ++++++++----------
translations/ring_client_windows_cs_CZ.ts | 103 ++++++++-----------
translations/ring_client_windows_da.ts | 103 ++++++++-----------
translations/ring_client_windows_da_DK.ts | 99 ++++++++----------
translations/ring_client_windows_de.ts | 103 ++++++++-----------
translations/ring_client_windows_de_DE.ts | 103 ++++++++-----------
translations/ring_client_windows_el.ts | 103 ++++++++-----------
translations/ring_client_windows_en_CA.ts | 99 ++++++++----------
translations/ring_client_windows_en_GB.ts | 99 ++++++++----------
translations/ring_client_windows_en_IE.ts | 99 ++++++++----------
translations/ring_client_windows_eo.ts | 103 ++++++++-----------
translations/ring_client_windows_es.ts | 103 ++++++++-----------
translations/ring_client_windows_es_AR.ts | 103 ++++++++-----------
translations/ring_client_windows_es_CO.ts | 103 ++++++++-----------
translations/ring_client_windows_es_MX.ts | 103 ++++++++-----------
translations/ring_client_windows_et.ts | 99 ++++++++----------
translations/ring_client_windows_et_EE.ts | 99 ++++++++----------
translations/ring_client_windows_eu.ts | 101 ++++++++----------
translations/ring_client_windows_fa.ts | 103 ++++++++-----------
translations/ring_client_windows_fa_IR.ts | 103 ++++++++-----------
translations/ring_client_windows_fi.ts | 103 ++++++++-----------
translations/ring_client_windows_fr.ts | 103 ++++++++-----------
translations/ring_client_windows_fr_BE.ts | 103 ++++++++-----------
translations/ring_client_windows_fr_CA.ts | 103 ++++++++-----------
translations/ring_client_windows_fr_CH.ts | 103 ++++++++-----------
translations/ring_client_windows_fr_FR.ts | 103 ++++++++-----------
translations/ring_client_windows_ga.ts | 99 ++++++++----------
translations/ring_client_windows_gl.ts | 101 ++++++++----------
translations/ring_client_windows_gu.ts | 99 ++++++++----------
translations/ring_client_windows_he.ts | 103 ++++++++-----------
translations/ring_client_windows_hi.ts | 99 ++++++++----------
translations/ring_client_windows_hi_IN.ts | 99 ++++++++----------
translations/ring_client_windows_hr.ts | 103 ++++++++-----------
translations/ring_client_windows_hu.ts | 103 ++++++++-----------
translations/ring_client_windows_id.ts | 103 ++++++++-----------
translations/ring_client_windows_ig.ts | 99 ++++++++----------
translations/ring_client_windows_it.ts | 103 ++++++++-----------
translations/ring_client_windows_it_IT.ts | 103 ++++++++-----------
translations/ring_client_windows_ja.ts | 103 ++++++++-----------
translations/ring_client_windows_kk.ts | 99 ++++++++----------
translations/ring_client_windows_kn.ts | 99 ++++++++----------
translations/ring_client_windows_ko.ts | 99 ++++++++----------
translations/ring_client_windows_ko_KR.ts | 99 ++++++++----------
translations/ring_client_windows_lt.ts | 103 ++++++++-----------
translations/ring_client_windows_ml.ts | 99 ++++++++----------
translations/ring_client_windows_mn_MN.ts | 99 ++++++++----------
translations/ring_client_windows_mr.ts | 99 ++++++++----------
translations/ring_client_windows_ms.ts | 103 ++++++++-----------
translations/ring_client_windows_nb.ts | 103 ++++++++-----------
translations/ring_client_windows_nb_NO.ts | 99 ++++++++----------
translations/ring_client_windows_ne.ts | 99 ++++++++----------
translations/ring_client_windows_nl.ts | 103 ++++++++-----------
translations/ring_client_windows_nl_BE.ts | 103 ++++++++-----------
translations/ring_client_windows_nl_NL.ts | 103 ++++++++-----------
translations/ring_client_windows_nn.ts | 99 ++++++++----------
translations/ring_client_windows_oc.ts | 101 ++++++++----------
translations/ring_client_windows_pa.ts | 103 ++++++++-----------
translations/ring_client_windows_pl.ts | 103 ++++++++-----------
translations/ring_client_windows_pl_PL.ts | 103 ++++++++-----------
translations/ring_client_windows_pt.ts | 103 ++++++++-----------
translations/ring_client_windows_pt_BR.ts | 103 ++++++++-----------
translations/ring_client_windows_pt_PT.ts | 103 ++++++++-----------
translations/ring_client_windows_ro.ts | 103 ++++++++-----------
translations/ring_client_windows_ro_RO.ts | 103 ++++++++-----------
translations/ring_client_windows_ru.ts | 103 ++++++++-----------
translations/ring_client_windows_ru_RU.ts | 103 ++++++++-----------
translations/ring_client_windows_si.ts | 99 ++++++++----------
translations/ring_client_windows_sk.ts | 101 ++++++++----------
translations/ring_client_windows_sk_SK.ts | 101 ++++++++----------
translations/ring_client_windows_sl.ts | 103 ++++++++-----------
translations/ring_client_windows_sq_AL.ts | 103 ++++++++-----------
translations/ring_client_windows_sr.ts | 99 ++++++++----------
translations/ring_client_windows_sr@Cyrl.ts | 99 ++++++++----------
translations/ring_client_windows_sr_RS.ts | 99 ++++++++----------
translations/ring_client_windows_sv.ts | 103 ++++++++-----------
translations/ring_client_windows_sw.ts | 99 ++++++++----------
translations/ring_client_windows_ta.ts | 99 ++++++++----------
translations/ring_client_windows_te.ts | 99 ++++++++----------
translations/ring_client_windows_th.ts | 99 ++++++++----------
translations/ring_client_windows_tr.ts | 103 ++++++++-----------
translations/ring_client_windows_tr_TR.ts | 99 ++++++++----------
translations/ring_client_windows_tt.ts | 99 ++++++++----------
translations/ring_client_windows_uk.ts | 103 ++++++++-----------
translations/ring_client_windows_uk_UA.ts | 99 ++++++++----------
translations/ring_client_windows_vi.ts | 99 ++++++++----------
translations/ring_client_windows_zh.ts | 103 ++++++++-----------
translations/ring_client_windows_zh_CN.ts | 103 ++++++++-----------
translations/ring_client_windows_zh_HK.ts | 103 ++++++++-----------
translations/ring_client_windows_zh_TW.ts | 103 ++++++++-----------
194 files changed, 8594 insertions(+), 11504 deletions(-)
diff --git a/translations/lrc_ar.ts b/translations/lrc_ar.ts
index 57a6233fc..238ce8313 100644
--- a/translations/lrc_ar.ts
+++ b/translations/lrc_ar.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>منذ يوم</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>منذ ساعة</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>في هذه اللحظة</translation>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_ar_EG.ts b/translations/lrc_ar_EG.ts
index db66e8e74..5b2177703 100644
--- a/translations/lrc_ar_EG.ts
+++ b/translations/lrc_ar_EG.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>منذ يوم</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>منذ ساعة</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>في هذه اللحظة</translation>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_az.ts b/translations/lrc_az.ts
index 3465853d3..8d8b201c6 100644
--- a/translations/lrc_az.ts
+++ b/translations/lrc_az.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_be.ts b/translations/lrc_be.ts
index c4d9ca098..ed152d472 100644
--- a/translations/lrc_be.ts
+++ b/translations/lrc_be.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_be_BY.ts b/translations/lrc_be_BY.ts
index c2e264af4..df043b75c 100644
--- a/translations/lrc_be_BY.ts
+++ b/translations/lrc_be_BY.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_bg.ts b/translations/lrc_bg.ts
index 6b49443af..103b2bb40 100644
--- a/translations/lrc_bg.ts
+++ b/translations/lrc_bg.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_bg_BG.ts b/translations/lrc_bg_BG.ts
index 4bc37ce0f..fbac3468a 100644
--- a/translations/lrc_bg_BG.ts
+++ b/translations/lrc_bg_BG.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_bn.ts b/translations/lrc_bn.ts
index d2e8f1e7c..497d44b5d 100644
--- a/translations/lrc_bn.ts
+++ b/translations/lrc_bn.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_ca.ts b/translations/lrc_ca.ts
index bf96271df..12f823a43 100644
--- a/translations/lrc_ca.ts
+++ b/translations/lrc_ca.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>jo</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nou missatge</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Petició de confiança</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3574,8 +3574,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3589,27 +3594,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>Fa un dia</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>Fa una hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Ara mateix</translation>
</message>
@@ -3673,132 +3658,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fes còpia de seguretat del compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_cs_CZ.ts b/translations/lrc_cs_CZ.ts
index 78588c947..27334afcd 100644
--- a/translations/lrc_cs_CZ.ts
+++ b/translations/lrc_cs_CZ.ts
@@ -12,7 +12,7 @@
<translation>Zmeškaný hovor od %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>Já</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nová zpráva</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Žádosti o důvěru</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Soukromý</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Soukromá skupina (omezené pozvánky)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Soukromá skupina</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Veřejná skupina</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Při načítání tohoto úložiště došlo k chybě.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Režim konverzace není rozpoznán.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Byla zjištěna neplatná zpráva</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Nedostatečné oprávnění pro aktualizaci informací o konverzaci</translation>
</message>
@@ -3585,9 +3585,14 @@ připojí, aby se sesynchronizovala konverzace.</translation>
<translation>Vypršel čas čekání na kontakt</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>před %1 dnem</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3600,27 +3605,7 @@ připojí, aby se sesynchronizovala konverzace.</translation>
<translation>Průběžně</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>včera</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>před %1 hodinou</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>před hodinou</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>před %1 minutou</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>teď</translation>
</message>
@@ -3684,132 +3669,132 @@ připojí, aby se sesynchronizovala konverzace.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Upravit</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Co znamená Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>Co znamená zelená tečka vedle mého účtu?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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>Volba názvu Jami byla inspirována svahilským slovem "jamii", které znamená podstatné jméno "komunita" a příslovce "společně".</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Zálohovat účet</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Červená tečka znamená, že je váš účet odpojen od sítě; když je připojen, změní se na zelenou.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Proč bych měl zálohovat svůj účet?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami je distribuována a váš účet je uložen pouze lokálně ve vašem zařízení. Pokud ztratíte heslo nebo místní data účtu, NEBUDE možné účet obnovit, pokud jste si jej dříve nezálohovali.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Mohu uskutečnit konferenční hovor?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Má Jami skupinové chaty?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Co je účet Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Účet Jami je asymetrický šifrovací klíč. Váš účet je identifikován pomocí ID Jami, což je otisk vašeho veřejného klíče.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Jaké údaje musím poskytnout pro vytvoření účtu Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Při vytváření nového účtu Jami nemusíte uvádět žádné soukromé údaje, jako je e-mail, adresa nebo telefonní číslo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>V aplikaci Jami je váš účet uložen v adresáři ve vašem zařízení. Heslo se používá pouze k zašifrování účtu, abyste byli chráněni před někým, kdo má fyzický přístup k vašemu zařízení.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Váš účet je uložen pouze ve vašich zařízeních. Pokud účet odstraníte ze všech svých zařízení, je navždy ztracen a nelze jej obnovit.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Mohu svůj účet používat na více zařízeních?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Ano, účet můžete propojit v nastavení nebo můžete importovat zálohu z jiného zařízení.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>Proč nemusím používat heslo?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>V hovoru můžete kliknutím na možnost "Přidat účastníky" přidat kontakt do hovoru.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>Proč si nemusím registrovat uživatelské jméno?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>Nejstálejším a nejbezpečnějším identifikátorem je vaše Jami ID, ale protože je pro některé lidi obtížné je používat, máte také možnost zaregistrovat si uživatelské jméno.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Jak mohu svůj účet zálohovat?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>V Nastavení účtu je k dispozici tlačítko pro vytvoření zálohy účtu.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Co se stane, když svůj účet odstraním?</translation>
</message>
diff --git a/translations/lrc_da.ts b/translations/lrc_da.ts
index cff92e6dd..ebc10e0b6 100644
--- a/translations/lrc_da.ts
+++ b/translations/lrc_da.ts
@@ -12,7 +12,7 @@
<translation>Ubesvaret opkald fra %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>mig</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Ny besked</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Hav tillid til anmodning</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3574,8 +3574,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>I dag</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3589,27 +3594,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3673,132 +3658,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_da_DK.ts b/translations/lrc_da_DK.ts
index e89e46d5e..f13a7f89c 100644
--- a/translations/lrc_da_DK.ts
+++ b/translations/lrc_da_DK.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -50,42 +50,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3172,32 +3172,17 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3674,132 +3659,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/lrc_de.ts b/translations/lrc_de.ts
index 727217db8..8ea091d5f 100644
--- a/translations/lrc_de.ts
+++ b/translations/lrc_de.ts
@@ -12,7 +12,7 @@
<translation>entgangener Anruf mit %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>Ich</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Neue Nachricht</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Anfrage vertrauen</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>private Gruppe (eingeschränkte Einladungen)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>private Gruppe</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>öffentliche Gruppe</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Beim Abrufen dieses Repositorys ist ein Fehler aufgetreten</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Der Unterhaltungsmodus wird nicht erkannt</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Eine ungültige Nachricht wurde erkannt</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Nicht genügend Autorisierung zum Aktualisieren der Unterhaltungsinformationen</translation>
</message>
@@ -3585,9 +3585,14 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<translation>Zeitüberschreitung beim Warten auf Kontakt</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>vor %1 Tagen</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Heute</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3600,27 +3605,7 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<translation>Laufend</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>vor einem Tag</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>vor %1 Stunde</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>vor einer Stunde</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>vor %1 Minute</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>gerade eben</translation>
</message>
@@ -3684,132 +3669,132 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Anpassen</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Was bedeutet Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 durch das Suaheli-Wort „jamii“ inspiriert, was als Substantiv „Gemeinschaft“ und als Adverb „zusammen“ bedeutet.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Konto sichern</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Ein roter Punkt bedeutet, dass Ihr Konto vom Netzwerk getrennt ist; er wird grün, wenn es verbunden ist.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Warum sollte ich mein Konto sichern?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami wird verteilt und Ihr Konto wird nur lokal auf Ihrem Gerät gespeichert. Wenn Sie Ihr Passwort oder Ihre lokalen Kontodaten verlieren, können Sie Ihr Konto NICHT wiederherstellen, wenn Sie es nicht vorher gesichert haben.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Kann ich einen Konferenzanruf machen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Hat Jami Gruppenchats?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Was ist ein Jami-Account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Wenn Sie ein neues Jami-Konto erstellen, müssen Sie keine privaten Informationen wie E-Mail, Adresse oder Telefonnummer angeben.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Bei Jami wird Ihr Konto in einem Verzeichnis auf Ihrem Gerät gespeichert. Das Passwort wird nur zum Verschlüsseln Ihres Kontos verwendet, um Sie vor jemandem zu schützen, der physischen Zugriff auf Ihr Gerät hat.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Ihr Konto wird nur auf Ihren eigenen Geräten gespeichert. Wenn Sie Ihr Konto von allen Ihren Geräten löschen, ist das Konto für immer weg und Sie können es NICHT wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Kann ich mein Konto auf mehreren Geräten verwenden?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>In den Kontoeinstellungen ist ein Button verfügbar, um ein Backup Ihres Kontos zu erstellen.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Was passiert, wenn ich mein Konto lösche?</translation>
</message>
diff --git a/translations/lrc_de_DE.ts b/translations/lrc_de_DE.ts
index 8c3bc5143..3b17056c1 100644
--- a/translations/lrc_de_DE.ts
+++ b/translations/lrc_de_DE.ts
@@ -12,7 +12,7 @@
<translation>entgangener Anruf mit %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>ich</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Neue Nachricht</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Vertrauensbeweis gefordert</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>private Gruppe (eingeschränkte Einladungen)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>private Gruppe</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>öffentliche Gruppe</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Beim Abrufen dieses Repositorys ist ein Fehler aufgetreten</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Der Unterhaltungsmodus wird nicht erkannt</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Eine ungültige Nachricht wurde erkannt</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Nicht genügend Autorisierung zum Aktualisieren der Unterhaltungsinformationen</translation>
</message>
@@ -3585,9 +3585,14 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<translation>Frist für das Warten auf Kontakt verstrichen</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>vor %1 Tagen</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Heute</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3600,27 +3605,7 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<translation>Übertragung läuft</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>vor einem Tag</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>vor %1 Stunde</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>vor einer Stunde</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>vor %1 Minute</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>gerade eben</translation>
</message>
@@ -3684,132 +3669,132 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Anpassen</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Was bedeutet Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 durch das Suaheli-Wort „jamii“ inspiriert, was als Substantiv „Gemeinschaft“ und als Adverb „zusammen“ bedeutet.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Konto sichern</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Ein roter Punkt bedeutet, dass Ihr Konto vom Netzwerk getrennt ist; er wird grün, wenn es verbunden ist.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Warum sollte ich mein Konto sichern?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami wird verteilt und Ihr Konto wird nur lokal auf Ihrem Gerät gespeichert. Wenn Sie Ihr Passwort oder Ihre lokalen Kontodaten verlieren, können Sie Ihr Konto NICHT wiederherstellen, wenn Sie es nicht vorher gesichert haben.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Kann ich einen Konferenzanruf machen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Hat Jami Gruppenchats?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Was ist ein Jami-Account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Wenn Sie ein neues Jami-Konto erstellen, müssen Sie keine privaten Informationen wie E-Mail, Adresse oder Telefonnummer angeben.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Bei Jami wird Ihr Konto in einem Verzeichnis auf Ihrem Gerät gespeichert. Das Passwort wird nur zum Verschlüsseln Ihres Kontos verwendet, um Sie vor jemandem zu schützen, der physischen Zugriff auf Ihr Gerät hat.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Ihr Konto wird nur auf Ihren eigenen Geräten gespeichert. Wenn Sie Ihr Konto von allen Ihren Geräten löschen, ist das Konto für immer weg und Sie können es NICHT wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Kann ich mein Konto auf mehreren Geräten verwenden?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>In den Kontoeinstellungen ist ein Button verfügbar, um ein Backup Ihres Kontos zu erstellen.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Was passiert, wenn ich mein Konto lösche?</translation>
</message>
diff --git a/translations/lrc_el.ts b/translations/lrc_el.ts
index 9ba2faf9c..8b7a2d19a 100644
--- a/translations/lrc_el.ts
+++ b/translations/lrc_el.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Σήμερα</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>μία ημέρα πρίν</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>μία ώρα πρίν</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Μόλις τώρα</translation>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_en.ts b/translations/lrc_en.ts
index 6327030b4..1850330ba 100644
--- a/translations/lrc_en.ts
+++ b/translations/lrc_en.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -50,42 +50,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3575,8 +3575,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3590,27 +3595,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3674,132 +3659,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/lrc_en_GB.ts b/translations/lrc_en_GB.ts
index 264d55b86..c99c23018 100644
--- a/translations/lrc_en_GB.ts
+++ b/translations/lrc_en_GB.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -50,42 +50,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3575,8 +3575,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3590,27 +3595,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3674,132 +3659,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/lrc_en_IE.ts b/translations/lrc_en_IE.ts
index d9ae6cf76..a8b3ad48a 100644
--- a/translations/lrc_en_IE.ts
+++ b/translations/lrc_en_IE.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -50,42 +50,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3575,8 +3575,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3590,27 +3595,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3674,132 +3659,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/lrc_eo.ts b/translations/lrc_eo.ts
index df2f6e303..c170417d9 100644
--- a/translations/lrc_eo.ts
+++ b/translations/lrc_eo.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,9 +3573,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hodiaŭ</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hieraŭ</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_es.ts b/translations/lrc_es.ts
index 283deb632..c7cdff9ec 100644
--- a/translations/lrc_es.ts
+++ b/translations/lrc_es.ts
@@ -12,7 +12,7 @@
<translation>Llamada perdida con %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>yo</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nuevo mensaje</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Solicitud de confianza</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grupo privado (invitaciones limitadas)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grupo privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grupo público</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Ha ocurrido un error al buscar en este repositorio</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Modo de conversación desconocido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Se ha detectado un mensaje inválido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Sin autorización para actualizar la info de la conversación</translation>
</message>
@@ -3584,9 +3584,14 @@ se conecte para sincronizar la conversación.</translation>
<translation>Expiró el tiempo de espera al contacto</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Hace %1 días</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoy</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ayer</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ se conecte para sincronizar la conversación.</translation>
<translation>En curso</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>hace un día</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Hace %1 horas</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>hace una hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Hace %1 minutos</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>justo ahora</translation>
</message>
@@ -3683,132 +3668,132 @@ se conecte para sincronizar la conversación.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizar</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>¿Qué significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>¿Qué representa el punto verde al lado de mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 elección del nombre Jami está inspirada en la palabra swahili "jamii", que significa "comunidad" como sustantivo y "juntos" como adjetivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Cuenta de respaldo</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rojo significa que tu cuenta está desconectada de la red; se pone verde cuando está conectada.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>¿Por qué debería respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami es distribuido y tu cuenta sólo se guarda localmente en tu dispositivo. Si perdés tu contraseña o tus datos locales, NO podrás recuperar tu cuenta si previamente no la habías respaldado.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>¿Puedo hacer una videoconferencia?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>¿Hay conversaciones grupales en Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>En las configuraciones podés habilitar el soporte para grupos (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>¿Qué es una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Una cuenta de Jami es una clave de cifrado asimétrico. Tu cuenta se identifica mediante un ID de Jami, el cual es la huella digital de tu clave pública.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>¿Qué información necesito dar para crear una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Cuando creás una nueva cuenta de Jami, no tenés que brindar ningún tipo de información privada como email, dirección o número de teléfono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>En Jami tu cuenta se guarda en una carpeta en tu dispositivo. La contraseña sólo se usa para cifrar tu cuenta para protegerte de alguien que tenga acceso físico a tu dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Tu cuenta sólo se guarda en tus dispositivos. Si la borrás de todos los dispositivos, se perderá para siempre y NO podrás recuperarla.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>¿Puedo usar mi cuenta desde múltiples dispositivos?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sí, podés vincular tu cuenta desde las configuraciones o podés importar tu respaldo en otro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>¿Por qué no necesito usar una contraseña?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>En una llamada, puede hacer clic en "Agregar participantes" para agregar un contacto.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>¿Por qué no necesito registrar un nombre de usuario?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>El identificador más seguro y permanente es tu ID de Jami, pero como es difícil de usar para algunas personas, también tenés la opción de registrar un nombre de usuario.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>¿Cómo puedo respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>En Configuración de la cuenta, hay un botón disponible para crear una copia de seguridad de su cuenta.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>¿Qué pasa cuando borro mi cuenta?</translation>
</message>
diff --git a/translations/lrc_es_AR.ts b/translations/lrc_es_AR.ts
index e921b45fa..c03f4c69e 100644
--- a/translations/lrc_es_AR.ts
+++ b/translations/lrc_es_AR.ts
@@ -12,7 +12,7 @@
<translation>Llamada perdida con %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>yo</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nuevo mensaje</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Solicitud de confianza</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grupo privado (invitaciones limitadas)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grupo privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grupo público</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Ha ocurrido un error al buscar en este repositorio</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Modo de conversación desconocido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Se ha detectado un mensaje inválido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Sin autorización para actualizar la info de la conversación</translation>
</message>
@@ -3584,9 +3584,14 @@ se conecte para sincronizar la conversación.</translation>
<translation>Expiró el tiempo de espera al contacto</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>hace %1 días</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoy</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ayer</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ se conecte para sincronizar la conversación.</translation>
<translation>En curso</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>hace un día</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>hace %1 horas</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>hace una hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>hace %1 minutos</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>hace un momento</translation>
</message>
@@ -3683,132 +3668,132 @@ se conecte para sincronizar la conversación.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizar</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>¿Qué significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>¿Qué representa el punto verde al lado de mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 elección del nombre Jami está inspirada en la palabra swahili "jamii", que significa "comunidad" como sustantivo y "juntos" como adjetivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Crear respaldo de la cuenta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rojo significa que tu cuenta está desconectada de la red; se pone verde cuando está conectada.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>¿Por qué debería respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami es distribuido y tu cuenta sólo se guarda localmente en tu dispositivo. Si perdés tu contraseña o tus datos locales, NO podrás recuperar tu cuenta si previamente no la habías respaldado.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>¿Puedo hacer una videoconferencia?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>¿Hay conversaciones grupales en Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>En las configuraciones podés habilitar el soporte para grupos (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>¿Qué es una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Una cuenta de Jami es una clave de cifrado asimétrico. Tu cuenta se identifica mediante un ID de Jami, el cual es la huella digital de tu clave pública.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>¿Qué información necesito dar para crear una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Cuando creás una nueva cuenta de Jami, no tenés que brindar ningún tipo de información privada como email, dirección o número de teléfono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>En Jami tu cuenta se guarda en una carpeta en tu dispositivo. La contraseña sólo se usa para cifrar tu cuenta para protegerte de alguien que tenga acceso físico a tu dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Tu cuenta sólo se guarda en tus dispositivos. Si la borrás de todos los dispositivos, se perderá para siempre y NO podrás recuperarla.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>¿Puedo usar mi cuenta desde múltiples dispositivos?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sí, podés vincular tu cuenta desde las configuraciones o podés importar tu respaldo en otro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>¿Por qué no necesito usar una contraseña?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>En una llamada, puede hacer clic en "Agregar participantes" para agregar un contacto.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>¿Por qué no necesito registrar un nombre de usuario?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>El identificador más seguro y permanente es tu ID de Jami, pero como es difícil de usar para algunas personas, también tenés la opción de registrar un nombre de usuario.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>¿Cómo puedo respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>En Configuración de la cuenta, hay un botón disponible para crear una copia de seguridad de su cuenta.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>¿Qué pasa cuando borro mi cuenta?</translation>
</message>
diff --git a/translations/lrc_es_CO.ts b/translations/lrc_es_CO.ts
index 781ed37f3..ec33767e4 100644
--- a/translations/lrc_es_CO.ts
+++ b/translations/lrc_es_CO.ts
@@ -12,7 +12,7 @@
<translation>Llamada perdida con %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>yo</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Mensaje nuevo</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Petición de confianza</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grupo privado (invitaciones limitadas)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grupo privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grupo público</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Ha ocurrido un error al buscar en este repositorio</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Modo de conversación desconocido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Se ha detectado un mensaje inválido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Sin autorización para actualizar la info de la conversación</translation>
</message>
@@ -3584,9 +3584,14 @@ se conecte para sincronizar la conversación.</translation>
<translation>Expiró el tiempo de espera al contacto</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Hace %1 días</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoy</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ayer</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ se conecte para sincronizar la conversación.</translation>
<translation>En curso</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>hace un día</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Hace %1 horas</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>hace una hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Hace %1 minutos</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>hace unos segundos</translation>
</message>
@@ -3683,132 +3668,132 @@ se conecte para sincronizar la conversación.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizar</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>¿Qué significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>¿Qué representa el punto verde al lado de mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 elección del nombre Jami está inspirada en la palabra swahili "jamii", que significa "comunidad" como sustantivo y "juntos" como adjetivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Crear respaldo de la cuenta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rojo significa que tu cuenta está desconectada de la red; se pone verde cuando está conectada.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>¿Por qué debería respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami es distribuido y tu cuenta sólo se guarda localmente en tu dispositivo. Si perdés tu contraseña o tus datos locales, NO podrás recuperar tu cuenta si previamente no la habías respaldado.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>¿Puedo hacer una videoconferencia?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>¿Hay conversaciones grupales en Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>En las configuraciones podés habilitar el soporte para grupos (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>¿Qué es una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Una cuenta de Jami es una clave de cifrado asimétrico. Tu cuenta se identifica mediante un ID de Jami, el cual es la huella digital de tu clave pública.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>¿Qué información necesito dar para crear una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Cuando creás una nueva cuenta de Jami, no tenés que brindar ningún tipo de información privada como email, dirección o número de teléfono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>En Jami tu cuenta se guarda en una carpeta en tu dispositivo. La contraseña sólo se usa para cifrar tu cuenta para protegerte de alguien que tenga acceso físico a tu dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Tu cuenta sólo se guarda en tus dispositivos. Si la borrás de todos los dispositivos, se perderá para siempre y NO podrás recuperarla.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>¿Puedo usar mi cuenta desde múltiples dispositivos?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sí, podés vincular tu cuenta desde las configuraciones o podés importar tu respaldo en otro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>¿Por qué no necesito usar una contraseña?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>En una llamada, puede hacer clic en "Agregar participantes" para agregar un contacto.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>¿Por qué no necesito registrar un nombre de usuario?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>El identificador más seguro y permanente es tu ID de Jami, pero como es difícil de usar para algunas personas, también tenés la opción de registrar un nombre de usuario.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>¿Cómo puedo respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>En Configuración de la cuenta, hay un botón disponible para crear una copia de seguridad de su cuenta.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>¿Qué pasa cuando borro mi cuenta?</translation>
</message>
diff --git a/translations/lrc_es_MX.ts b/translations/lrc_es_MX.ts
index 5d6ce0278..0190587b2 100644
--- a/translations/lrc_es_MX.ts
+++ b/translations/lrc_es_MX.ts
@@ -12,7 +12,7 @@
<translation>Llamada perdida con %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>yo</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Mensaje nuevo</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Solicitud de confianza</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grupo privado (invitaciones limitadas)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grupo privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grupo público</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Ha ocurrido un error al buscar en este repositorio</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Modo de conversación desconocido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Se ha detectado un mensaje inválido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Sin autorización para actualizar la info de la conversación</translation>
</message>
@@ -3584,9 +3584,14 @@ se conecte para sincronizar la conversación.</translation>
<translation>Expiró el tiempo de espera al contacto</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Hace %1 días</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoy</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ayer</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ se conecte para sincronizar la conversación.</translation>
<translation>En curso</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>hace un día</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Hace %1 horas</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>hace una hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Hace %1 minutos</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>hace un momento</translation>
</message>
@@ -3683,132 +3668,132 @@ se conecte para sincronizar la conversación.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizar</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>¿Qué significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>¿Qué representa el punto verde al lado de mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 elección del nombre Jami está inspirada en la palabra swahili "jamii", que significa "comunidad" como sustantivo y "juntos" como adjetivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Crear respaldo de la cuenta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rojo significa que tu cuenta está desconectada de la red; se pone verde cuando está conectada.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>¿Por qué debería respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami es distribuido y tu cuenta sólo se guarda localmente en tu dispositivo. Si perdés tu contraseña o tus datos locales, NO podrás recuperar tu cuenta si previamente no la habías respaldado.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>¿Puedo hacer una videoconferencia?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>¿Hay conversaciones grupales en Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>En las configuraciones podés habilitar el soporte para grupos (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>¿Qué es una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Una cuenta de Jami es una clave de cifrado asimétrico. Tu cuenta se identifica mediante un ID de Jami, el cual es la huella digital de tu clave pública.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>¿Qué información necesito dar para crear una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Cuando creás una nueva cuenta de Jami, no tenés que brindar ningún tipo de información privada como email, dirección o número de teléfono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>En Jami tu cuenta se guarda en una carpeta en tu dispositivo. La contraseña sólo se usa para cifrar tu cuenta para protegerte de alguien que tenga acceso físico a tu dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Tu cuenta sólo se guarda en tus dispositivos. Si la borrás de todos los dispositivos, se perderá para siempre y NO podrás recuperarla.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>¿Puedo usar mi cuenta desde múltiples dispositivos?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sí, podés vincular tu cuenta desde las configuraciones o podés importar tu respaldo en otro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>¿Por qué no necesito usar una contraseña?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>En una llamada, puede hacer clic en "Agregar participantes" para agregar un contacto.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>¿Por qué no necesito registrar un nombre de usuario?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>El identificador más seguro y permanente es tu ID de Jami, pero como es difícil de usar para algunas personas, también tenés la opción de registrar un nombre de usuario.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>¿Cómo puedo respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>En Configuración de la cuenta, hay un botón disponible para crear una copia de seguridad de su cuenta.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>¿Qué pasa cuando borro mi cuenta?</translation>
</message>
diff --git a/translations/lrc_et.ts b/translations/lrc_et.ts
index 57b629309..de133df91 100644
--- a/translations/lrc_et.ts
+++ b/translations/lrc_et.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_et_EE.ts b/translations/lrc_et_EE.ts
index e5c8c806a..8bc7aaaaf 100644
--- a/translations/lrc_et_EE.ts
+++ b/translations/lrc_et_EE.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_eu.ts b/translations/lrc_eu.ts
index 6b85ec726..d4b47712f 100644
--- a/translations/lrc_eu.ts
+++ b/translations/lrc_eu.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,10 +3573,15 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Atzo</translation>
+ </message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
<source>Canceled</source>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Egin kontuaren babes-kopia</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_fa.ts b/translations/lrc_fa.ts
index e52bd25e7..9eb0bdb92 100644
--- a/translations/lrc_fa.ts
+++ b/translations/lrc_fa.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>من</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>پیام جدید</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>درخواست اعتماد</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3577,9 +3577,14 @@ connects to synchronize the conversation.</source>
<translation>زمان انتظار برای تماس به پایان رسید</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>امروز</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>دیروز</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3592,27 +3597,7 @@ connects to synchronize the conversation.</source>
<translation>در جریان</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>یک روز پیش</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>یک ساعت پیش</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>همین الان</translation>
</message>
@@ -3676,132 +3661,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>پشتیبانگیری حساب</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_fa_IR.ts b/translations/lrc_fa_IR.ts
index dc10c3d66..7f28a4c5c 100644
--- a/translations/lrc_fa_IR.ts
+++ b/translations/lrc_fa_IR.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>من</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>پیام جدید</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>درخواست اعتماد</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3577,9 +3577,14 @@ connects to synchronize the conversation.</source>
<translation>زمان انتظار برای تماس به پایان رسید</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>امروز</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>دیروز</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3592,27 +3597,7 @@ connects to synchronize the conversation.</source>
<translation>در جریان</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>یک روز پیش</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>یک ساعت پیش</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>همین الان</translation>
</message>
@@ -3676,132 +3661,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>پشتیبانگیری حساب</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_fi.ts b/translations/lrc_fi.ts
index 068668d54..2791455de 100644
--- a/translations/lrc_fi.ts
+++ b/translations/lrc_fi.ts
@@ -12,7 +12,7 @@
<translation>Vastaamaton puhelu %1 :lta</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>minä</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Uusi viesti</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Luottamuspyyntö</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3580,9 +3580,14 @@ tahdistaa yhteyden keskusteluun.</translation>
<translation>Aikakatkaisu odottavalle yhteydelle</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 päivää sitten</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Tänään</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Eilen</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3595,27 +3600,7 @@ tahdistaa yhteyden keskusteluun.</translation>
<translation>Käynnissä</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>yksi päivä sitten</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 tuntia sitten</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>yksi tunti sitten</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minuuttia sitten</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juuri nyt</translation>
</message>
@@ -3679,132 +3664,132 @@ tahdistaa yhteyden keskusteluun.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Varmuuskopioi tunnus</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_fr.ts b/translations/lrc_fr.ts
index c26cd75ef..7552fc84b 100644
--- a/translations/lrc_fr.ts
+++ b/translations/lrc_fr.ts
@@ -12,7 +12,7 @@
<translation>Vous avez manqué un appel de %1 </translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>moi</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nouveau message</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Invitation</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Groupe privé (sur invitation)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Groupe privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Groupe publique</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Une erreur s'est produite lors de la récupération de ce référentiel.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Le mode de la conversation n'est pas reconnu.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Un message invalide a été détecté</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Droits insuffisants pour mettre à jour les infos de la conversation</translation>
</message>
@@ -3584,9 +3584,14 @@ connects to synchronize the conversation.</source>
<translation>Délai d'attente de votre contact dépassé</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Il y a %1 jour(s)</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Aujourd'hui</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hier</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ connects to synchronize the conversation.</source>
<translation>En cours</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>il y a une journée</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Il y a %1 heure(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>il y a une heure</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Il y a %1 minute(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juste maintenant</translation>
</message>
@@ -3683,132 +3668,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Paramétrer</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sauvegarder le compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un point rouge signifie que votre compte est déconnecté du réseau ; il devient vert lorsqu'il est connecté.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pourquoi dois-je faire une sauvegarde de mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami est distribué et votre compte n'est stocké que localement sur votre appareil. Si vous perdez votre mot de passe ou les données de votre compte local, vous NE POURREZ PAS récupérer votre compte si vous ne l'avez pas sauvegardé auparavant.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<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="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<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="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Avec Jami, votre compte est stocké dans un répertoire 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Votre compte est uniquement stocké sur vos propres appareils. Si vous supprimez votre compte de tous vos appareils, le compte est perdu à jamais et vous ne pouvez pas le récupérer.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Oui, vous pouvez lier votre compte à partir des paramètres, ou vous pouvez importer votre sauvegarde sur un autre appareil.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dans un appel, vous pouvez cliquer sur "Ajouter des participants" pour ajouter un contact à un appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dans les paramètres du compte, un bouton est disponible pour créer une sauvegarde de votre compte.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
diff --git a/translations/lrc_fr_BE.ts b/translations/lrc_fr_BE.ts
index 87d05d0ff..a5e13ad95 100644
--- a/translations/lrc_fr_BE.ts
+++ b/translations/lrc_fr_BE.ts
@@ -12,7 +12,7 @@
<translation>Vous avez manqué un appel de %1 </translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>moi</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nouveau message</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Invitation</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Groupe privé (sur invitation)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Groupe privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Groupe publique</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Une erreur s'est produite lors de la récupération de ce référentiel.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Le mode de la conversation n'est pas reconnu.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Un message invalide a été détecté</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Droits insuffisants pour mettre à jour les infos de la conversation</translation>
</message>
@@ -3584,9 +3584,14 @@ connects to synchronize the conversation.</source>
<translation>Délai d'attente de votre contact dépassé</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Il y a %1 jour(s)</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Aujourd'hui</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hier</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ connects to synchronize the conversation.</source>
<translation>En cours</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>il y a une journée</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Il y a %1 heure(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>il y a une heure</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Il y a %1 minute(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juste maintenant</translation>
</message>
@@ -3683,132 +3668,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Paramétrer</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sauvegarder le compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un point rouge signifie que votre compte est déconnecté du réseau ; il devient vert lorsqu'il est connecté.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pourquoi dois-je faire une sauvegarde de mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami est distribué et votre compte n'est stocké que localement sur votre appareil. Si vous perdez votre mot de passe ou les données de votre compte local, vous NE POURREZ PAS récupérer votre compte si vous ne l'avez pas sauvegardé auparavant.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<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="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<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="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Avec Jami, votre compte est stocké dans un répertoire 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Votre compte est uniquement stocké sur vos propres appareils. Si vous supprimez votre compte de tous vos appareils, le compte est perdu à jamais et vous ne pouvez pas le récupérer.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Oui, vous pouvez lier votre compte à partir des paramètres, ou vous pouvez importer votre sauvegarde sur un autre appareil.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dans un appel, vous pouvez cliquer sur "Ajouter des participants" pour ajouter un contact à un appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dans les paramètres du compte, un bouton est disponible pour créer une sauvegarde de votre compte.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
diff --git a/translations/lrc_fr_CA.ts b/translations/lrc_fr_CA.ts
index b22a0a664..413e5f9dc 100644
--- a/translations/lrc_fr_CA.ts
+++ b/translations/lrc_fr_CA.ts
@@ -12,7 +12,7 @@
<translation>Vous avez manqué un appel de %1 </translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>moi</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nouveau message</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Invitation</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Groupe privé (sur invitation)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Groupe privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Groupe publique</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Une erreur s'est produite lors de la récupération de ce référentiel.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Le mode de la conversation n'est pas reconnu.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Un message invalide a été détecté</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Droits insuffisants pour mettre à jour les infos de la conversation</translation>
</message>
@@ -3584,9 +3584,14 @@ connects to synchronize the conversation.</source>
<translation>Délai d'attente de votre contact dépassé</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Il y a %1 jour(s)</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Aujourd'hui</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hier</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ connects to synchronize the conversation.</source>
<translation>En cours</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>il y a une journée</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Il y a %1 heure(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>il y a une heure</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Il y a %1 minute(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juste maintenant</translation>
</message>
@@ -3683,132 +3668,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Paramétrer</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sauvegarder le compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un point rouge signifie que votre compte est déconnecté du réseau ; il devient vert lorsqu'il est connecté.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pourquoi dois-je faire une sauvegarde de mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami est distribué et votre compte n'est stocké que localement sur votre appareil. Si vous perdez votre mot de passe ou les données de votre compte local, vous NE POURREZ PAS récupérer votre compte si vous ne l'avez pas sauvegardé auparavant.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<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="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<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="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Avec Jami, votre compte est stocké dans un répertoire 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Votre compte est uniquement stocké sur vos propres appareils. Si vous supprimez votre compte de tous vos appareils, le compte est perdu à jamais et vous ne pouvez pas le récupérer.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Oui, vous pouvez lier votre compte à partir des paramètres, ou vous pouvez importer votre sauvegarde sur un autre appareil.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dans un appel, vous pouvez cliquer sur "Ajouter des participants" pour ajouter un contact à un appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dans les paramètres du compte, un bouton est disponible pour créer une sauvegarde de votre compte.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
diff --git a/translations/lrc_fr_CH.ts b/translations/lrc_fr_CH.ts
index 515b6c85d..f09b60a76 100644
--- a/translations/lrc_fr_CH.ts
+++ b/translations/lrc_fr_CH.ts
@@ -12,7 +12,7 @@
<translation>Vous avez manqué un appel de %1 </translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>moi</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nouveau message</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Invitation</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Groupe privé (sur invitation)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Groupe privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Groupe publique</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Une erreur s'est produite lors de la récupération de ce référentiel.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Le mode de la conversation n'est pas reconnu.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Un message invalide a été détecté</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Droits insuffisants pour mettre à jour les infos de la conversation</translation>
</message>
@@ -3584,9 +3584,14 @@ connects to synchronize the conversation.</source>
<translation>Délai d'attente de votre contact dépassé</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Il y a %1 jour(s)</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Aujourd'hui</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hier</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ connects to synchronize the conversation.</source>
<translation>En cours</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>il y a une journée</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Il y a %1 heure(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>il y a une heure</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Il y a %1 minute(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juste maintenant</translation>
</message>
@@ -3683,132 +3668,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Paramétrer</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sauvegarder le compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un point rouge signifie que votre compte est déconnecté du réseau ; il devient vert lorsqu'il est connecté.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pourquoi dois-je faire une sauvegarde de mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami est distribué et votre compte n'est stocké que localement sur votre appareil. Si vous perdez votre mot de passe ou les données de votre compte local, vous NE POURREZ PAS récupérer votre compte si vous ne l'avez pas sauvegardé auparavant.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<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="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<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="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Avec Jami, votre compte est stocké dans un répertoire 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Votre compte est uniquement stocké sur vos propres appareils. Si vous supprimez votre compte de tous vos appareils, le compte est perdu à jamais et vous ne pouvez pas le récupérer.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Oui, vous pouvez lier votre compte à partir des paramètres, ou vous pouvez importer votre sauvegarde sur un autre appareil.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dans un appel, vous pouvez cliquer sur "Ajouter des participants" pour ajouter un contact à un appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dans les paramètres du compte, un bouton est disponible pour créer une sauvegarde de votre compte.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
diff --git a/translations/lrc_fr_FR.ts b/translations/lrc_fr_FR.ts
index 4cee21eef..7c956a80d 100644
--- a/translations/lrc_fr_FR.ts
+++ b/translations/lrc_fr_FR.ts
@@ -12,7 +12,7 @@
<translation>Vous avez manqué un appel de %1 </translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>moi</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nouveau message</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Invitation</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Groupe privé (sur invitation)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Groupe privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Groupe publique</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Une erreur s'est produite lors de la récupération de ce référentiel.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Le mode de la conversation n'est pas reconnu.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Un message invalide a été détecté</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Droits insuffisants pour mettre à jour les infos de la conversation</translation>
</message>
@@ -3584,9 +3584,14 @@ connects to synchronize the conversation.</source>
<translation>Délai d'attente de votre contact dépassé</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Il y a %1 jour(s)</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Aujourd'hui</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hier</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ connects to synchronize the conversation.</source>
<translation>En cours</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>il y a une journée</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Il y a %1 heure(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>il y a une heure</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Il y a %1 minute(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juste maintenant</translation>
</message>
@@ -3683,132 +3668,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Paramétrer</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sauvegarder le compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un point rouge signifie que votre compte est déconnecté du réseau ; il devient vert lorsqu'il est connecté.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pourquoi dois-je faire une sauvegarde de mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami est distribué et votre compte n'est stocké que localement sur votre appareil. Si vous perdez votre mot de passe ou les données de votre compte local, vous NE POURREZ PAS récupérer votre compte si vous ne l'avez pas sauvegardé auparavant.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<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="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<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="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Avec Jami, votre compte est stocké dans un répertoire 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Votre compte est uniquement stocké sur vos propres appareils. Si vous supprimez votre compte de tous vos appareils, le compte est perdu à jamais et vous ne pouvez pas le récupérer.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Oui, vous pouvez lier votre compte à partir des paramètres, ou vous pouvez importer votre sauvegarde sur un autre appareil.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dans un appel, vous pouvez cliquer sur "Ajouter des participants" pour ajouter un contact à un appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dans les paramètres du compte, un bouton est disponible pour créer une sauvegarde de votre compte.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
diff --git a/translations/lrc_ga.ts b/translations/lrc_ga.ts
index be40144fd..452ba88f8 100644
--- a/translations/lrc_ga.ts
+++ b/translations/lrc_ga.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_gl.ts b/translations/lrc_gl.ts
index 83f4a53ab..cd8521bee 100644
--- a/translations/lrc_gl.ts
+++ b/translations/lrc_gl.ts
@@ -12,7 +12,7 @@
<translation>Chamada perdida de %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nova mensaxe</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Confiar na solicitude</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grupo privado (convites restrinxidos)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grupo privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grupo público</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Houbo un fallo ao obter este repositorio</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>O modo da conversa non é recoñecible</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Detectouse unha mensaxe non válida</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Non hai permiso suficiente para actualizar a info da conversa</translation>
</message>
@@ -3576,10 +3576,15 @@ connects to synchronize the conversation.</source>
<translation>Caducou a espera polo contacto</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Onte</translation>
+ </message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
<source>Canceled</source>
@@ -3591,27 +3596,7 @@ connects to synchronize the conversation.</source>
<translation>Saínte</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>fai un día</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>fai unha hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>xusto agora</translation>
</message>
@@ -3675,132 +3660,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizar</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Copia de apoio da conta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Por que é recomendable facer copia de apoio?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Podo facer videochamadas?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Cando creas unha conta Jami non tes que proporcionar ningunha información privada como email, enderezo ou número de teléfono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>O identificador máis seguro e permanente é o teu Jami ID, pero como é complicado de lembrar e usar, tamén tes a opción de rexistrar un nome de usuaria.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_gu.ts b/translations/lrc_gu.ts
index 86c7dcfd0..afb3f8a43 100644
--- a/translations/lrc_gu.ts
+++ b/translations/lrc_gu.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_he.ts b/translations/lrc_he.ts
index 2ba3024d0..37901786a 100644
--- a/translations/lrc_he.ts
+++ b/translations/lrc_he.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,9 +3573,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>היום</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>אתמול</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>לפני יום</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>לפני שעה</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_hi.ts b/translations/lrc_hi.ts
index aee118e78..3c1710c2e 100644
--- a/translations/lrc_hi.ts
+++ b/translations/lrc_hi.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_hi_IN.ts b/translations/lrc_hi_IN.ts
index f2b59159b..fe9944eb3 100644
--- a/translations/lrc_hi_IN.ts
+++ b/translations/lrc_hi_IN.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_hr.ts b/translations/lrc_hr.ts
index 7b661d0c5..b410a8dc3 100644
--- a/translations/lrc_hr.ts
+++ b/translations/lrc_hr.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,9 +3573,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Danas</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Jučer</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_hu.ts b/translations/lrc_hu.ts
index 496a5aaa3..a0ce50682 100644
--- a/translations/lrc_hu.ts
+++ b/translations/lrc_hu.ts
@@ -12,7 +12,7 @@
<translation>Nem fogadott hívás a következővel: %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>én</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Új üzenet</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Megbízható kérelem</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Magánjellegű</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Személyes csoport (korlátozott meghívók)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Személyes csoport</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Nyilvános csoport</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Hiba történt az adattár lekérése közben</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Felismeretlen beszélgetési mód</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Érvénytelen üzenet észlelve</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Nincs jogosultság a beszélgetési adatok frissítésére</translation>
</message>
@@ -3584,9 +3584,14 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<translation>Időtúllépés várt a kapcsolattartásra</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 napja</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Ma</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Tegnap</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<translation>Folyamatban lévő</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>egy napja</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 órája</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>egy órája</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 perce</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>most</translation>
</message>
@@ -3683,132 +3668,132 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Testreszabás</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Mit jelent a Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fiók biztonsági mentése</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Miért szükséges biztonsági másolatot készíteni egy fiókról?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>A Jami el van osztva, és fiókja csak helyileg tárolódik az eszközén. Ha elveszíti jelszavát vagy helyi fiókadatait, nem tudja visszaállítani fiókját, ha korábban nem készített biztonsági másolatot.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Indíthatok konferenciahívást?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Van Jaminak csoportos csevegése?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Mi az a Jami-fiók?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Ú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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Fiókját csak a saját eszközei tárolják. Ha törli fiókját az összes eszközéről, a fiók végleg eltűnik, és nem lehet helyreállítani.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Használható egy fiók több eszközön?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>A fiókbeállításokban elérhető egy gomb a fiók biztonsági másolatának létrehozásához.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Mi történik a fiók törlésekor?</translation>
</message>
diff --git a/translations/lrc_id.ts b/translations/lrc_id.ts
index 6dfa7f89f..c77d2d0c9 100644
--- a/translations/lrc_id.ts
+++ b/translations/lrc_id.ts
@@ -12,7 +12,7 @@
<translation>Panggilan terlewat dari %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>saya</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Pesan baru</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Permintaan kepercayaan</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grup privat (undangan terbatas)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grup privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grup publik</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Terjadi error saat mengambil repositori ini</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Modus percakapan tidak dikenali</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Pesan yang tidak valid terdeteksi</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Tidak cukup otorisasi untuk memperbarui info percakapan</translation>
</message>
@@ -3581,9 +3581,14 @@ tersambung untuk menyinkronkan percakapan.</translation>
<translation>Waktu habis menunggu kontak</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 hari yang lalu</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hari ini</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Kemarin</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3596,27 +3601,7 @@ tersambung untuk menyinkronkan percakapan.</translation>
<translation>Berlangsung</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>satu hari yang lalu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 jam yang lalu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>satu jam yang lalu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 menit yang lalu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Baru saja</translation>
</message>
@@ -3680,132 +3665,132 @@ tersambung untuk menyinkronkan percakapan.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Sesuaikan</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Apa yang dimaksud dengan Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>Apakah titik hijau di samping akun saya?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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>Pemilihan nama Jami terinspirasi oleh kata Swahili 'jamii', yang berarti 'komunitas' sebagai kata benda dan 'bersama' sebagai kata keterangan.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Cadangkan akun</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Titik merah berarti bahwa akun Anda terputus dari jaringan; titik ini berubah menjadi hijau ketika sudah terhubung.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Mengapa saya harus mencadangkan akun saya?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami didistribusikan dan akun Anda hanya disimpan secara lokal di perangkat Anda. Jika Anda kehilangan kata sandi atau data akun lokal Anda, Anda TIDAK AKAN dapat memulihkan akun Anda jika Anda tidak mencadangkannya sebelumnya.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Dapatkah saya melakukan panggilan konferensi?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Apakah jami memiliki obrolan grup?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dalam pengaturan, Anda dapat mengaktifkan dukungan untuk grup (eksperimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Apa yang dimaksud dengan akun Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Akun Jami adalah kunci enkripsi asimetris. Akun Anda diidentifikasi oleh Jami ID, yang merupakan sidik jari dari kunci publik Anda.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Informasi apa yang perlu saya berikan untuk membuat akun Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Saat Anda membuat akun Jami baru, Anda tidak perlu memberikan informasi pribadi apa pun seperti email, alamat, atau nomor telepon.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Dengan Jami, akun Anda disimpan dalam direktori pada perangkat Anda. Kata sandi hanya digunakan untuk mengenkripsi akun Anda untuk melindungi Anda dari seseorang yang memiliki akses fisik ke perangkat Anda.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Akun Anda hanya tersimpan di perangkat Anda sendiri. Jika Anda menghapus akun Anda dari semua perangkat Anda, akun tersebut akan hilang selamanya dan Anda TIDAK BISA memulihkannya.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Dapatkah saya menggunakan akun saya pada beberapa perangkat?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Ya, Anda bisa menautkan akun Anda dari pengaturan, atau Anda bisa mengimpor cadangan Anda pada perangkat lain.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>Mengapa saya tidak harus menggunakan kata sandi?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dalam panggilan, Anda bisa mengklik "Tambah partisipan" untuk menambahkan kontak ke panggilan.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>Mengapa saya tidak harus mendaftarkan nama pengguna?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>Pengidentifikasi yang paling permanen dan aman adalah Jami ID Anda, tetapi karena ini sulit digunakan bagi sebagian orang, Anda juga memiliki opsi untuk mendaftarkan nama pengguna.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Bagaimana saya mencadangkan akun saya?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dalam Account Settings (Pengaturan Akun), tersedia tombol untuk membuat cadangan akun Anda.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Apa yang terjadi apabila saya menghapus akun saya?</translation>
</message>
diff --git a/translations/lrc_ig.ts b/translations/lrc_ig.ts
index ecea5791f..4e0ae78ca 100644
--- a/translations/lrc_ig.ts
+++ b/translations/lrc_ig.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_it.ts b/translations/lrc_it.ts
index 3599be0ab..36c2dfd67 100644
--- a/translations/lrc_it.ts
+++ b/translations/lrc_it.ts
@@ -12,7 +12,7 @@
<translation>Chiamata persa da %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>io</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nuovo messaggio</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Richiesta fidata</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privato</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Gruppo privato (inviti limitati)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Gruppo privato</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Gruppo pubblico</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Si è verificato un errore durante il recupero di questo repository</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>La modalità della conversazione non è riconosciuta</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>È stato rilevato un messaggio non valido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Non ci sono abbastanza autorizzazioni per aggiornare le informazioni sulla conversazione</translation>
</message>
@@ -3585,9 +3585,14 @@ si connetta per sincronizzare la conversazione.</translation>
<translation>Tempo scaduto in attesa di contatto</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 giorni fa</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Oggi</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ieri</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3600,27 +3605,7 @@ si connetta per sincronizzare la conversazione.</translation>
<translation>In corso</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>un giorno fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 ore fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>un'ora fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minuti fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>ora</translation>
</message>
@@ -3684,132 +3669,132 @@ si connetta per sincronizzare la conversazione.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizza</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Cosa significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fai il backup dell'account</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rosso significa che l'account è disconnesso dalla rete; mentre diventa verde quando è connesso.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Perché dovrei fare il backup del mio account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami è distribuito e il tuo account è memorizzato solo localmente sul tuo dispositivo. Se si perde la password o i dati locali dell'account, NON sarà possibile recuperare l'account se non si è eseguito il backup in precedenza.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Posso fare una teleconferenza?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Jami ha chat di gruppo?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Che cos'è un conto Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Quando si crea un nuovo account Jami, non è necessario fornire informazioni private come e-mail, indirizzo o numero di telefono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>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 tuo dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Il tuo account è memorizzato solo sui tuoi dispositivi. Se si elimina l'account da tutti i tuoi dispositivi, l'account è perso per sempre e NON può essere recuperato.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Posso utilizzare il mio account su più dispositivi?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sì, è possibile collegare il proprio account dalle impostazioni, oppure importare il backup su un altro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Nelle impostazioni dell'account è disponibile un pulsante per eseguire il backup dell'account.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Cosa succede quando elimino il mio account?</translation>
</message>
diff --git a/translations/lrc_it_IT.ts b/translations/lrc_it_IT.ts
index 1289e4f88..59a2c0095 100644
--- a/translations/lrc_it_IT.ts
+++ b/translations/lrc_it_IT.ts
@@ -12,7 +12,7 @@
<translation>Chiamata persa da %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>io</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nuovo messaggio</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Richiesta fidata</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privato</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Gruppo privato (inviti limitati)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Gruppo privato</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Gruppo pubblico</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Si è verificato un errore durante il recupero di questo repository</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>La modalità della conversazione non è riconosciuta</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>È stato rilevato un messaggio non valido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Non ci sono abbastanza autorizzazioni per aggiornare le informazioni sulla conversazione</translation>
</message>
@@ -3585,9 +3585,14 @@ si connetta per sincronizzare la conversazione.</translation>
<translation>Tempo scaduto in attesa di contatto</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 giorni fa</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Oggi</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ieri</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3600,27 +3605,7 @@ si connetta per sincronizzare la conversazione.</translation>
<translation>In corso</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>un giorno fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 ore fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>un'ora fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minuti fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>proprio adesso</translation>
</message>
@@ -3684,132 +3669,132 @@ si connetta per sincronizzare la conversazione.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizza</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Cosa significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fai il backup dell'account</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rosso significa che l'account è disconnesso dalla rete; mentre diventa verde quando è connesso.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Perché dovrei fare il backup del mio account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami è distribuito e il tuo account è memorizzato solo localmente sul tuo dispositivo. Se si perde la password o i dati locali dell'account, NON sarà possibile recuperare l'account se non si è eseguito il backup in precedenza.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Posso fare una teleconferenza?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Jami ha chat di gruppo?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Che cos'è un conto Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Quando si crea un nuovo account Jami, non è necessario fornire informazioni private come e-mail, indirizzo o numero di telefono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>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 tuo dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Il tuo account è memorizzato solo sui tuoi dispositivi. Se si elimina l'account da tutti i tuoi dispositivi, l'account è perso per sempre e NON può essere recuperato.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Posso utilizzare il mio account su più dispositivi?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sì, è possibile collegare il proprio account dalle impostazioni, oppure importare il backup su un altro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Nelle impostazioni dell'account è disponibile un pulsante per eseguire il backup dell'account.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Cosa succede quando elimino il mio account?</translation>
</message>
diff --git a/translations/lrc_ja.ts b/translations/lrc_ja.ts
index 122c96878..4fc8816ad 100644
--- a/translations/lrc_ja.ts
+++ b/translations/lrc_ja.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>自分</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>新規メッセージ</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>要求を信頼</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3575,9 +3575,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>今日</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>昨日</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3590,27 +3595,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>1 日前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>1 時間前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>ちょうど今</translation>
</message>
@@ -3674,132 +3659,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>アカウントをバックアップ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_kk.ts b/translations/lrc_kk.ts
index 620e44dd3..86559d558 100644
--- a/translations/lrc_kk.ts
+++ b/translations/lrc_kk.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_kn.ts b/translations/lrc_kn.ts
index 9f97bf70e..e4f1638ef 100644
--- a/translations/lrc_kn.ts
+++ b/translations/lrc_kn.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_ko.ts b/translations/lrc_ko.ts
index f065ecc87..9c34aa710 100644
--- a/translations/lrc_ko.ts
+++ b/translations/lrc_ko.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_ko_KR.ts b/translations/lrc_ko_KR.ts
index 55e90368f..df0c5b1e6 100644
--- a/translations/lrc_ko_KR.ts
+++ b/translations/lrc_ko_KR.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_lt.ts b/translations/lrc_lt.ts
index 1b5c121d7..155a99e2f 100644
--- a/translations/lrc_lt.ts
+++ b/translations/lrc_lt.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nauja žinutė</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3574,9 +3574,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Šiandien</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Vakar</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3589,27 +3594,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>prieš vieną dieną</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>prieš vieną valandą</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>ką tik</translation>
</message>
@@ -3673,132 +3658,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Padaryti paskyros atsarginę kopiją</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_ml.ts b/translations/lrc_ml.ts
index 9caebcec2..a071f2d49 100644
--- a/translations/lrc_ml.ts
+++ b/translations/lrc_ml.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_mn_MN.ts b/translations/lrc_mn_MN.ts
index f07198d9c..106e965c9 100644
--- a/translations/lrc_mn_MN.ts
+++ b/translations/lrc_mn_MN.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_mr.ts b/translations/lrc_mr.ts
index 3787b1e4f..a5592f1c4 100644
--- a/translations/lrc_mr.ts
+++ b/translations/lrc_mr.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_ms.ts b/translations/lrc_ms.ts
index 60832323a..15a997657 100644
--- a/translations/lrc_ms.ts
+++ b/translations/lrc_ms.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,9 +3573,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hari ini</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Semalam</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_nb.ts b/translations/lrc_nb.ts
index e8c31369d..0f8daa03f 100644
--- a/translations/lrc_nb.ts
+++ b/translations/lrc_nb.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>meg</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Ny melding</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Stol på henvendelse</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3580,9 +3580,14 @@ kobler seg til for å synkronisere samtalen.</translation>
<translation>Tidsavbrudd ventet på kontakt</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 dager siden</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Igår</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3595,27 +3600,7 @@ kobler seg til for å synkronisere samtalen.</translation>
<translation>Pågående</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>i går</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 timer siden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>en time siden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minutter siden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>akkurat nå</translation>
</message>
@@ -3679,132 +3664,132 @@ kobler seg til for å synkronisere samtalen.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sikkerhetskopier konto</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_ne.ts b/translations/lrc_ne.ts
index f0503506b..293d85fef 100644
--- a/translations/lrc_ne.ts
+++ b/translations/lrc_ne.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_nl.ts b/translations/lrc_nl.ts
index 6342ef8c1..a7f0577fa 100644
--- a/translations/lrc_nl.ts
+++ b/translations/lrc_nl.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nieuw bericht</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Vertrouwensverzoek</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3574,9 +3574,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Vandaag</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Gisteren</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3589,27 +3594,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>een dag geleden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>een uur geleden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>zonet</translation>
</message>
@@ -3673,132 +3658,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Reservekopie van account maken</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_nl_BE.ts b/translations/lrc_nl_BE.ts
index fba206fa9..3630c253e 100644
--- a/translations/lrc_nl_BE.ts
+++ b/translations/lrc_nl_BE.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nieuw bericht</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Vertrouwensverzoek</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3574,9 +3574,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Vandaag</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Gisteren</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3589,27 +3594,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>een dag geleden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>een uur geleden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Nu net</translation>
</message>
@@ -3673,132 +3658,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Back-up maken van account</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_nl_NL.ts b/translations/lrc_nl_NL.ts
index d515995d0..9f6ed7ac4 100644
--- a/translations/lrc_nl_NL.ts
+++ b/translations/lrc_nl_NL.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nieuw bericht</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Vertrouwensverzoek</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3574,9 +3574,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Vandaag</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Gisteren</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3589,27 +3594,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>een dag geleden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>een uur geleden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Nu net</translation>
</message>
@@ -3673,132 +3658,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Reservekopie van account maken</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_nn.ts b/translations/lrc_nn.ts
index 7b0eaa5d9..a12ca16f7 100644
--- a/translations/lrc_nn.ts
+++ b/translations/lrc_nn.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_oc.ts b/translations/lrc_oc.ts
index 1bd95d93e..afbfa7e96 100644
--- a/translations/lrc_oc.ts
+++ b/translations/lrc_oc.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nòu messatge</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3574,10 +3574,15 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ièr</translation>
+ </message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
<source>Canceled</source>
@@ -3589,27 +3594,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Ara meteis</translation>
</message>
@@ -3673,132 +3658,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_pa.ts b/translations/lrc_pa.ts
index 728b49f3f..a96733c34 100644
--- a/translations/lrc_pa.ts
+++ b/translations/lrc_pa.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,9 +3573,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>ਅੱਜ</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>ਕੱਲ੍ਹ</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>ਬੈਕਅੱਪ ਖਾਤਾ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_pl.ts b/translations/lrc_pl.ts
index b3b099a01..4b9966266 100644
--- a/translations/lrc_pl.ts
+++ b/translations/lrc_pl.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>ja</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nowa wiadomość</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Rządanie zaufania</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3576,9 +3576,14 @@ connects to synchronize the conversation.</source>
<translation>Przekroczono czas czekając na kontakt</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Dzisiaj</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Wczoraj</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3591,27 +3596,7 @@ connects to synchronize the conversation.</source>
<translation>W trakcie</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>jeden dzień temu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>jedną godzinę temu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>teraz</translation>
</message>
@@ -3675,132 +3660,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Wykonaj kopię zapasową</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_pl_PL.ts b/translations/lrc_pl_PL.ts
index dfc291e34..7620b041f 100644
--- a/translations/lrc_pl_PL.ts
+++ b/translations/lrc_pl_PL.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>ja</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nowa wiadomość</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Rządanie zaufania</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3576,9 +3576,14 @@ connects to synchronize the conversation.</source>
<translation>Przekroczono czas czekając na kontakt</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Dzisiaj</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Wczoraj</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3591,27 +3596,7 @@ connects to synchronize the conversation.</source>
<translation>W trakcie</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>jeden dzień temu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>jedną godzinę temu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>teraz</translation>
</message>
@@ -3675,132 +3660,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Wykonaj kopię zapasową</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_pt.ts b/translations/lrc_pt.ts
index 4905cfc97..53b2d54a8 100644
--- a/translations/lrc_pt.ts
+++ b/translations/lrc_pt.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nova mensagem</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Confiar no pedido</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3580,9 +3580,14 @@ conectar para sincronizar a conversação.</translation>
<translation>O tempo de aguardo pelo contato chegou ao fim</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 dias atrás</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoje</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ontem</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3595,27 +3600,7 @@ conectar para sincronizar a conversação.</translation>
<translation>Em andamento</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>há um dia</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 horas atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>há uma hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minutos atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>agora mesmo</translation>
</message>
@@ -3679,132 +3664,132 @@ conectar para sincronizar a conversação.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Conta de cópia de segurança</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_pt_BR.ts b/translations/lrc_pt_BR.ts
index bb306adc5..881812b40 100644
--- a/translations/lrc_pt_BR.ts
+++ b/translations/lrc_pt_BR.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nova mensagem</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Confiar na requisição</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3580,9 +3580,14 @@ conectar para sincronizar a conversação.</translation>
<translation>O tempo de aguardo pelo contato chegou ao fim</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 dias atrás</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoje</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ontem</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3595,27 +3600,7 @@ conectar para sincronizar a conversação.</translation>
<translation>Em andamento</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>um dia atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 horas atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>uma hora atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minutos atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Agora</translation>
</message>
@@ -3679,132 +3664,132 @@ conectar para sincronizar a conversação.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Cópia de segurança da conta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_pt_PT.ts b/translations/lrc_pt_PT.ts
index 8b69db30c..58a1800f1 100644
--- a/translations/lrc_pt_PT.ts
+++ b/translations/lrc_pt_PT.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nova mensagem</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Confiar no pedido</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3580,9 +3580,14 @@ conectar para sincronizar a conversação.</translation>
<translation>O tempo de aguardo pelo contato chegou ao fim</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 dias atrás</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoje</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ontem</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3595,27 +3600,7 @@ conectar para sincronizar a conversação.</translation>
<translation>Em andamento</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>há um dia</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 horas atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>há uma hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minutos atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>agora mesmo</translation>
</message>
@@ -3679,132 +3664,132 @@ conectar para sincronizar a conversação.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Conta de cópia de segurança</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_ro.ts b/translations/lrc_ro.ts
index d569ace34..af9e2957e 100644
--- a/translations/lrc_ro.ts
+++ b/translations/lrc_ro.ts
@@ -12,7 +12,7 @@
<translation>Apel pierdut de la %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Mesaj nou</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Cerere de încredere</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grup privat (invitații limitate)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grup privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grup public</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>A apărut o eroare la obținerea acestui depozit</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Tipul conversației nu e recunoscut.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>A fost detectat un mesaj greșit</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Autorizații insuficiente pentru actualizarea informațiilor despre conversație</translation>
</message>
@@ -3584,9 +3584,14 @@ să se conecteze pentru a sincroniza conversația.</translation>
<translation>Timpul de așteptare a expirat</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>acum %1 zile</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ieri</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ să se conecteze pentru a sincroniza conversația.</translation>
<translation>În curs</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>acum o zi</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>acum %1 ore</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>acum o oră</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>acum %1 minute</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>chiar acum</translation>
</message>
@@ -3683,132 +3668,132 @@ să se conecteze pentru a sincroniza conversația.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizează</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Ce înseamnă Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fă o copie de rezervă</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>De ce ar trebui să fac o copie de rezervă a contului meu?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami este distribuit, iar contul tău este stocat doar la nivel local în aparatul tău. Dacă pierzi parola sau datele locale ale contului, NU vei putea să îți recuperezi contul dacă nu ai făcut înainte o copie de rezervă.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Pot face o teleconferință?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Are Jami discuții în grup?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Ce este un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Contul tău este stocat doar în aparatele tale. Dacă-ți ștergi contul din toate aparatele, contul dispare și NU îl mai poți recupera.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Pot să-mi folosesc contul pe mai multe aparate?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>În reglările contului, este disponibil un buton pentru a face o copie de rezervă a contului.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Ce se întîmplă dacă îmi șterg contul?</translation>
</message>
diff --git a/translations/lrc_ro_RO.ts b/translations/lrc_ro_RO.ts
index 314e5fe4b..8bfad3f25 100644
--- a/translations/lrc_ro_RO.ts
+++ b/translations/lrc_ro_RO.ts
@@ -12,7 +12,7 @@
<translation>Apel pierdut de la %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Mesaj nou</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Cerere de încredere</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grup privat (invitații limitate)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grup privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grup public</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>A apărut o eroare la obținerea acestui depozit</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Tipul conversației nu e recunoscut.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>A fost detectat un mesaj greșit</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Autorizații insuficiente pentru actualizarea informațiilor despre conversație</translation>
</message>
@@ -3584,9 +3584,14 @@ să se conecteze pentru a sincroniza conversația.</translation>
<translation>Timpul de așteptare a expirat</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>acum %1 zile</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ieri</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3599,27 +3604,7 @@ să se conecteze pentru a sincroniza conversația.</translation>
<translation>În curs</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>acum o zi</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>acum %1 ore</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>acum o oră</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>acum %1 minute</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>chiar acum</translation>
</message>
@@ -3683,132 +3668,132 @@ să se conecteze pentru a sincroniza conversația.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizează</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Ce înseamnă Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fă o copie de rezervă</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>De ce ar trebui să fac o copie de rezervă a contului meu?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami este distribuit, iar contul tău este stocat doar la nivel local în aparatul tău. Dacă pierzi parola sau datele locale ale contului, NU vei putea să îți recuperezi contul dacă nu ai făcut înainte o copie de rezervă.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Pot face o teleconferință?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Are Jami discuții în grup?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Ce este un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Contul tău este stocat doar în aparatele tale. Dacă-ți ștergi contul din toate aparatele, contul dispare și NU îl mai poți recupera.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Pot să-mi folosesc contul pe mai multe aparate?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>În reglările contului, este disponibil un buton pentru a face o copie de rezervă a contului.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Ce se întâmplă dacă îmi șterg contul?</translation>
</message>
diff --git a/translations/lrc_ru.ts b/translations/lrc_ru.ts
index 54cc629e7..5a22e1637 100644
--- a/translations/lrc_ru.ts
+++ b/translations/lrc_ru.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>мне</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Новое сообщение</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Запрос доверия</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3579,9 +3579,14 @@ connects to synchronize the conversation.</source>
<translation>Тайм-аут ожидания контакта</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 дней назад</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Сегодня</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Вчера</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3594,27 +3599,7 @@ connects to synchronize the conversation.</source>
<translation>Текущий</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>один день назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 часов назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>один час назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 минут назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>прямо сейчас</translation>
</message>
@@ -3678,132 +3663,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>Что означает зелёная точка рядом с моим аккаунтом?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Создать резервную копию аккаунта</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Что такое аккаунт Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Аккаунт Jami — это асимметричный ключ шифрования. Ваш аккаунт идентифицируется Jami ID, который является отпечатком вашего открытого ключа.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Какую информацию мне нужно предоставить для создания аккаунта Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Как мне создать резервную копию своего аккаунта?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>В настройках аккаунта доступна кнопка для создания резервной копии вашего аккаунта.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Что происходит, когда я удаляю свой аккаунт?</translation>
</message>
diff --git a/translations/lrc_ru_RU.ts b/translations/lrc_ru_RU.ts
index 7a556799c..446b3b0ef 100644
--- a/translations/lrc_ru_RU.ts
+++ b/translations/lrc_ru_RU.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>я</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Новое сообщение</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Запрос доверия</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3579,9 +3579,14 @@ connects to synchronize the conversation.</source>
<translation>Тайм-аут ожидания контакта</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 дней назад</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Сегодня</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Вчера</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3594,27 +3599,7 @@ connects to synchronize the conversation.</source>
<translation>Текущий</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>вчера</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 часов назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>час назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 минут назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>только что</translation>
</message>
@@ -3678,132 +3663,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>Что означает зелёная точка рядом с моим аккаунтом?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Резервная копия аккаунта</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Что такое аккаунт Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Аккаунт Jami — это асимметричный ключ шифрования. Ваш аккаунт идентифицируется Jami ID, который является отпечатком вашего открытого ключа.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Какую информацию мне нужно предоставить для создания аккаунта Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Как мне создать резервную копию своего аккаунта?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>В настройках аккаунта доступна кнопка для создания резервной копии вашего аккаунта.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Что происходит, когда я удаляю свой аккаунт?</translation>
</message>
diff --git a/translations/lrc_si.ts b/translations/lrc_si.ts
index cd50f4b78..a60ffb405 100644
--- a/translations/lrc_si.ts
+++ b/translations/lrc_si.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_sk.ts b/translations/lrc_sk.ts
index 432508728..edff0b234 100644
--- a/translations/lrc_sk.ts
+++ b/translations/lrc_sk.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nová správa</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Veriť žiadosti</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3574,9 +3574,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Dnes</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Včera</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3589,27 +3594,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>Včera</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>Pred hodinou</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Práve teraz</translation>
</message>
@@ -3673,132 +3658,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Zálohovať účet</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_sk_SK.ts b/translations/lrc_sk_SK.ts
index 7282e6bc9..c7253c1fd 100644
--- a/translations/lrc_sk_SK.ts
+++ b/translations/lrc_sk_SK.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nová správa</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Veriť žiadosti</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3574,9 +3574,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Dnes</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Včera</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3589,27 +3594,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>Včera</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>Pred hodinou</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Práve teraz</translation>
</message>
@@ -3673,132 +3658,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Zálohovať účet</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_sl.ts b/translations/lrc_sl.ts
index 5fe6e2929..e32219b56 100644
--- a/translations/lrc_sl.ts
+++ b/translations/lrc_sl.ts
@@ -12,7 +12,7 @@
<translation>Zgrešen klic: %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>jaz</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Novo sporočilo</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Zaupaj zahtevku</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Zasebno</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Zasebna skupina (omejena povabila)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Zasebna skupina</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Javna skupina</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Pri pridobivanju tega skladišča je prišlo do napake</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Način pogovora ni prepoznan</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Zaznano je neveljavno sporočilo</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Nezadostna overitev za posodobitev podatkov pogovora</translation>
</message>
@@ -3585,9 +3585,14 @@ poveže, da sinhroniziramo pogovor.</translation>
<translation>Čas čakanja na stik je pretekel</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Pred %1 dnevi</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Danes</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Včeraj</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3600,27 +3605,7 @@ poveže, da sinhroniziramo pogovor.</translation>
<translation>V teku</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>pred enim dnevom</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Pred %1 urami</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>pred eno uro</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Pred %1 minutami</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>ravnokar</translation>
</message>
@@ -3684,132 +3669,132 @@ poveže, da sinhroniziramo pogovor.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Prilagodi</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Kaj pomeni Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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>Ime 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Varnostno kopiranje računa</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Rdeča pika pomeni, da vaš račun ni povezan v omrežje; spremeni se v zeleno, ko je povezan.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Zakaj bi bilo dobro, da varnostno kopiram svoj račun?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami je porazdeljen in vaš račun je shranjen samo krajevno na vaši napravi. Če izgubite geslo ali podatke vašega krajevnega računa, NE BOSTE mogli obnoviti svojega računa, če ga poprej niste varnostno kopirali.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Ali ima Jami skupinske klepete?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Kaj je račun Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Ko ustvarite nov račun Jami, ne rabite podati nobenih zasebnih podatkov, kot so e-naslov, naslov ali telefonska številka.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Z Jamijem je vaš račun shranjen v mapi na vaši napravi. Geslo se uporabi samo za šifriranje vašega računa, da vas zaščiti pred nekom, ki ima fizični dostop do vaše naprave.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Vaš račun se hrani le na vaših lastnih napravah. Če izbrišete račun iz vseh svojih naprav, je račun za vekomaj izginil in ga NE morete obnoviti.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Ali lahko uporabljam svoj račun na več napravah?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Da, svoj račun lahko povežete prek nastavitev ali uvozite svojo varnostno kopijo na drugo napravo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>V Nastavitvah računa je na voljo gumb, s pritiskom katerega varnostno kopirate svoj račun.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Kaj se zgodi, če izbrišem svoj račun?</translation>
</message>
diff --git a/translations/lrc_sq_AL.ts b/translations/lrc_sq_AL.ts
index 05ee40627..8fcf63977 100644
--- a/translations/lrc_sq_AL.ts
+++ b/translations/lrc_sq_AL.ts
@@ -12,7 +12,7 @@
<translation>Thirrje e humbur me %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>unë</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Mesazh i ri</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Kërkesë besueshmërie</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grup privat (kufizim ftesash)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grup privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grup publik</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Ndodhi një gabim, kur sillej kjo depo</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Mënyra e bisedës është e panjohur</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>U pikas një mesazh i pavlefshëm</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Pa autorizim të mjaftueshëm për përditësim hollësish bisede</translation>
</message>
@@ -3585,9 +3585,14 @@ të lidhet, për njëkohësim të bisedës.</translation>
<translation>Mbaroi koha duke pritur për kontakt</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 ditë më parë</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Sot</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Dje</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3600,27 +3605,7 @@ të lidhet, për njëkohësim të bisedës.</translation>
<translation>Në punë e sipër</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>një ditë më parë</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 orë më parë</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>një orë më parë</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minuta më parë</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>mu tani</translation>
</message>
@@ -3684,132 +3669,132 @@ të lidhet, për njëkohësim të bisedës.</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Përshtateni</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Ç’do të thotë Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>Ç’nënkupton pika e gjelbër në krah të llogarisë time?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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>Zgjedhja e emrit Jami u frymëzua nga fjala “jamii” e suahilishtes, që, si emër, do të thotë “bashkësi” dhe si ndajfolje do të thotë “tok”.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Kopjeruaje llogarinë</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Një topth i kuq do të thotë se llogaria juaj është shkëputur nga rrjeti; bëhet i gjelbër, kur ajo lidhet.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pse duhet ta kopjeruaj llogarinë time?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami është platformë e shpërndarë dhe llogaria juaj depozitohet lokalisht vetëm në pajisjen tuaj. Nëse humbni fjalëkalimin tuaj, ose të dhënat vendore të llogarisë tuaj, NUK do të jeni në gjendje të ringjallni llogarinë tuaj, nëse nuk e keni kopjeruajtur më herët.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>A mund të bëj thirrje konferencë?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>A ka fjalosje në grup Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Te rregullimet, mund të aktivizoni mbulim për grupe (eksperimentale)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Ç’është një llogari Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Një llogari Jami është një kyç asimetrik fshehtëzimi. Llogaria juaj identifikohet nga një ID Jami që është shenjë gishti e kyçit tuaj publik.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Ç’hollësi duhet të jap për të krijuar një llogari Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Kur krijoni një llogari të re Jami, nuk ju duhet të jepni ndonjë hollësi private, bie fjala, një email, adresë, apo numër telefoni.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Me Jami-n, llogaria juaj depozitohet në një drejtori në pajisjen tuaj. Fjalëkalimi përdoret vetëm për të fshehtëzuar llogarinë tuaj, me qëllim mbrojtjen tuaj nga dikush që ka shtënë në dorë pajisjen tuaj.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Llogaria juaj depozitohet lokalisht vetëm në pajisjen tuaj. Nëse fshini llogarinë tuaj nga krejt pajisjet tuaja, llogaria ikën përgjithmonë dhe NUK mund ta ringjallni.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>A mund ta përdor llogarinë time në pajisje të shumta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Po, mund ta lidhni llogarinë tuaj që nga rregullimet, ose mund të importoni kopjeruajtjen tuaj në një pajisje tjetër.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>Pse s’më duhet të përdor një fjalëkalim?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Gjatë një thirrjeje, mund të klikoni mbi “Shtoni pjesëmarrës”, që të shtoni një kontakt te thirrja.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>Pse më duhet të regjistroj një emër përdoruesi?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>Identifikuesi më i qëndrueshëm, më i sigurt është ID-ja juaj Jami, por ngaqë këto janë të vështira për t’u përdorur nga disa persona, keni gjithashtu mundësinë e regjistrimit të një emri përdoruesi.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Si mund ta kopjeruaj llogarinë time?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Te Rregullime Llogarie ka një buton për të krijuar një kopjeruajtje të llogarisë tuaj.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Ç’ndodh nëse fshij llogariën time?</translation>
</message>
diff --git a/translations/lrc_sr.ts b/translations/lrc_sr.ts
index dff5af36f..518f72465 100644
--- a/translations/lrc_sr.ts
+++ b/translations/lrc_sr.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_sr@Cyrl.ts b/translations/lrc_sr@Cyrl.ts
index 9d1370b97..15efade19 100644
--- a/translations/lrc_sr@Cyrl.ts
+++ b/translations/lrc_sr@Cyrl.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_sr_RS.ts b/translations/lrc_sr_RS.ts
index 7cac46250..fe7309efa 100644
--- a/translations/lrc_sr_RS.ts
+++ b/translations/lrc_sr_RS.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -50,42 +50,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3575,8 +3575,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3590,27 +3595,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3674,132 +3659,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/lrc_sv.ts b/translations/lrc_sv.ts
index de7d8ff40..1ced655a2 100644
--- a/translations/lrc_sv.ts
+++ b/translations/lrc_sv.ts
@@ -12,7 +12,7 @@
<translation>Missat samtal med %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>jag</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nytt meddelande</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Lita på begäran</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3578,9 +3578,14 @@ ansluter för att synkronisera konversationen. </translation>
<translation>Tidsfel inväntar kontakt</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 dagar sedan</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>I dag</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>I går</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3593,27 +3598,7 @@ ansluter för att synkronisera konversationen. </translation>
<translation>Pågående</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>en dag sedan</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 timmar sedan</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>en timma sedan</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minuter sedan</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>just nu</translation>
</message>
@@ -3677,132 +3662,132 @@ ansluter för att synkronisera konversationen. </translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Säkerhetskopiera konto</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_sw.ts b/translations/lrc_sw.ts
index cb7131116..b933ba90b 100644
--- a/translations/lrc_sw.ts
+++ b/translations/lrc_sw.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_ta.ts b/translations/lrc_ta.ts
index 0463227ac..7514663e7 100644
--- a/translations/lrc_ta.ts
+++ b/translations/lrc_ta.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_te.ts b/translations/lrc_te.ts
index 2ae3633d4..ba59b39ed 100644
--- a/translations/lrc_te.ts
+++ b/translations/lrc_te.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_th.ts b/translations/lrc_th.ts
index aec27ab65..0c7218990 100644
--- a/translations/lrc_th.ts
+++ b/translations/lrc_th.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_tr.ts b/translations/lrc_tr.ts
index a00cc82ab..44272fb15 100644
--- a/translations/lrc_tr.ts
+++ b/translations/lrc_tr.ts
@@ -12,7 +12,7 @@
<translation>%1 ile cevapsız arama</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>ben</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Yeni ileti</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Güven isteği</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3580,9 +3580,14 @@ bağlanana kadar bekleyin</translation>
<translation>İletişim zaman aşımına uğradı</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 gün önce</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Bugün</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Dün</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3595,27 +3600,7 @@ bağlanana kadar bekleyin</translation>
<translation>Devam Ediyor</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>bir gün önce</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 saat önce</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>bir saat önce</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 dakika önce</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Şu an</translation>
</message>
@@ -3679,132 +3664,132 @@ bağlanana kadar bekleyin</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Hesabı yedekle</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_tr_TR.ts b/translations/lrc_tr_TR.ts
index 689ae8936..2a963bff9 100644
--- a/translations/lrc_tr_TR.ts
+++ b/translations/lrc_tr_TR.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -50,42 +50,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3575,8 +3575,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3590,27 +3595,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3674,132 +3659,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/lrc_tt.ts b/translations/lrc_tt.ts
index 1834a9ad9..64f38c82f 100644
--- a/translations/lrc_tt.ts
+++ b/translations/lrc_tt.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_uk.ts b/translations/lrc_uk.ts
index 0fec01c1d..1976cbf26 100644
--- a/translations/lrc_uk.ts
+++ b/translations/lrc_uk.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>мені</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Нове повідомлення</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Запит довіри</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3574,9 +3574,14 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Сьогодні</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Вчора</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3589,27 +3594,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>один день тому</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>одну годину тому</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>щойно</translation>
</message>
@@ -3673,132 +3658,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Резервна копія облікового запису</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Чому мені потрібно створити резервну копію свого облікового запису?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Як я можу створити резервну копію свого облікового запису?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_uk_UA.ts b/translations/lrc_uk_UA.ts
index 40e67806f..bfb6bba60 100644
--- a/translations/lrc_uk_UA.ts
+++ b/translations/lrc_uk_UA.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -50,42 +50,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3585,32 +3585,17 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3674,132 +3659,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/lrc_vi.ts b/translations/lrc_vi.ts
index 370d49969..cf46d6049 100644
--- a/translations/lrc_vi.ts
+++ b/translations/lrc_vi.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3573,8 +3573,13 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3588,27 +3593,7 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3672,132 +3657,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/lrc_zh.ts b/translations/lrc_zh.ts
index 6ddfe8e67..3b94f11c5 100644
--- a/translations/lrc_zh.ts
+++ b/translations/lrc_zh.ts
@@ -12,7 +12,7 @@
<translation>來自 %1 的未接來電</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>我</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>新消息</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>信任請求</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>私密组</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>公开组<br></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>会话模式未识别</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>检测到无效的消息</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3580,9 +3580,14 @@ connects to synchronize the conversation.</source>
<translation>等待联系人超时</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>今天</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>昨天</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3595,27 +3600,7 @@ connects to synchronize the conversation.</source>
<translation>正在进行</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>一天前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>一小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 分钟前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>刚才</translation>
</message>
@@ -3679,132 +3664,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>自定义</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Jami 有何含义？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>备份账户</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>为什么应该备份账户？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami是分布式，你的账号仅保存在本地设备里。如果你忘记密码或丢失本地账号数据，也没有提前备份的话，你将无法恢复你的账号。</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>怎样备份账户?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>在账户设置里，创建备份账户的按钮可用</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>删除自己的账号会发生什么?</translation>
</message>
diff --git a/translations/lrc_zh_CN.ts b/translations/lrc_zh_CN.ts
index 6596990fc..f0c908e8f 100644
--- a/translations/lrc_zh_CN.ts
+++ b/translations/lrc_zh_CN.ts
@@ -12,7 +12,7 @@
<translation>來自 %1 的未接來電</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>我</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>新消息</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>信任请求</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>私密组</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>公开组<br></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>会话模式未识别</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>检测到无效的消息</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3580,9 +3580,14 @@ connects to synchronize the conversation.</source>
<translation>等待联系人超时</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>今天</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>昨天</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3595,27 +3600,7 @@ connects to synchronize the conversation.</source>
<translation>正在进行</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>一天前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>一小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 分钟前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>刚才</translation>
</message>
@@ -3679,132 +3664,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>自定义</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Jami 有何含义？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>备份账户</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>为什么应该备份账户？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami是分布式，你的账号仅保存在本地设备里。如果你忘记密码或丢失本地账号数据，也没有提前备份的话，你将无法恢复你的账号。</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>怎样备份账户?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>在账户设置里，创建备份账户的按钮可用</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>删除自己的账号会发生什么?</translation>
</message>
diff --git a/translations/lrc_zh_HK.ts b/translations/lrc_zh_HK.ts
index 250a079c6..40f95e0e7 100644
--- a/translations/lrc_zh_HK.ts
+++ b/translations/lrc_zh_HK.ts
@@ -12,7 +12,7 @@
<translation>來自 %1 的未接來電</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>我</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>新消息</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>信任請求</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>私密组</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>公开组<br></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>会话模式未识别</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>检测到无效的消息</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3580,9 +3580,14 @@ connects to synchronize the conversation.</source>
<translation>等待联系人超时</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>今天</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>昨天</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3595,27 +3600,7 @@ connects to synchronize the conversation.</source>
<translation>正在进行</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>一天前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>一小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 分钟前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>刚才</translation>
</message>
@@ -3679,132 +3664,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>自定义</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Jami 有何含义？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>备份账户</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>为什么应该备份账户？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami是分布式，你的账号仅保存在本地设备里。如果你忘记密码或丢失本地账号数据，也没有提前备份的话，你将无法恢复你的账号。</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>怎样备份账户?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>在账户设置里，创建备份账户的按钮可用</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>删除自己的账号会发生什么?</translation>
</message>
diff --git a/translations/lrc_zh_TW.ts b/translations/lrc_zh_TW.ts
index f4eb1de4d..09cacd7ed 100644
--- a/translations/lrc_zh_TW.ts
+++ b/translations/lrc_zh_TW.ts
@@ -12,7 +12,7 @@
<translation>來自 %1 的未接來電</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>我</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>新訊息</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>信任請求</translation>
</message>
@@ -48,42 +48,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>私密组</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>公开组<br></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>会话模式未识别</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>检测到无效的消息</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3580,9 +3580,14 @@ connects to synchronize the conversation.</source>
<translation>等待聯絡人逾時</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>今天</translation>
+ </message>
+ <message>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>昨天</translation>
</message>
<message>
<location filename="../src/app/messagesadapter.cpp" line="290"/>
@@ -3595,27 +3600,7 @@ connects to synchronize the conversation.</source>
<translation>進行中</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>1 天前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 小時前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>1 小時前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 分鐘前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>現在</translation>
</message>
@@ -3679,132 +3664,132 @@ connects to synchronize the conversation.</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>自定义</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Jami 有何含义？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>備份帳號</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>为什么应该备份账户？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami是分布式，你的账号仅保存在本地设备里。如果你忘记密码或丢失本地账号数据，也没有提前备份的话，你将无法恢复你的账号。</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>怎样备份账户?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>在账户设置里，创建备份账户的按钮可用</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>删除自己的账号会发生什么?</translation>
</message>
diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index 20e23ecc0..622652754 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -58,42 +58,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3188,32 +3188,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3690,132 +3675,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts
index 2b6fcfd28..87ae6210b 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation>تم الإنتهاء</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>منذ يوم</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>اليوم</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>منذ ساعة</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>البارحة</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>في هذه اللحظة</translation>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ar_EG.ts b/translations/ring_client_windows_ar_EG.ts
index 950986124..fdb3b9c34 100644
--- a/translations/ring_client_windows_ar_EG.ts
+++ b/translations/ring_client_windows_ar_EG.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation>تم الإنتهاء</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>منذ يوم</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>اليوم</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>منذ ساعة</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>البارحة</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>في هذه اللحظة</translation>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_az.ts b/translations/ring_client_windows_az.ts
index c469d6671..dbd043584 100644
--- a/translations/ring_client_windows_az.ts
+++ b/translations/ring_client_windows_az.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_be.ts b/translations/ring_client_windows_be.ts
index cd1081c17..70985d5ee 100644
--- a/translations/ring_client_windows_be.ts
+++ b/translations/ring_client_windows_be.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_be_BY.ts b/translations/ring_client_windows_be_BY.ts
index a8e4d8748..6b6a85cad 100644
--- a/translations/ring_client_windows_be_BY.ts
+++ b/translations/ring_client_windows_be_BY.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts
index 13ecdf6fc..5cff844c6 100644
--- a/translations/ring_client_windows_bg.ts
+++ b/translations/ring_client_windows_bg.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Днес</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Вчера</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_bg_BG.ts b/translations/ring_client_windows_bg_BG.ts
index 861afb497..be4d42366 100644
--- a/translations/ring_client_windows_bg_BG.ts
+++ b/translations/ring_client_windows_bg_BG.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Днес</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Вчера</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_bn.ts b/translations/ring_client_windows_bn.ts
index 16b0c0203..33649a643 100644
--- a/translations/ring_client_windows_bn.ts
+++ b/translations/ring_client_windows_bn.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts
index 8c63f5933..f18961b5c 100644
--- a/translations/ring_client_windows_ca.ts
+++ b/translations/ring_client_windows_ca.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>jo</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nou missatge</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Petició de confiança</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3187,32 +3187,17 @@ Copiï'l i comparteixi'l amb els seus amics!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>Fa un dia</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ahir</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>Fa una hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Ara mateix</translation>
</message>
@@ -3689,132 +3674,132 @@ Copiï'l i comparteixi'l amb els seus amics!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fes còpia de seguretat del compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_cs_CZ.ts b/translations/ring_client_windows_cs_CZ.ts
index bfd110abe..232040e93 100644
--- a/translations/ring_client_windows_cs_CZ.ts
+++ b/translations/ring_client_windows_cs_CZ.ts
@@ -12,7 +12,7 @@
<translation>Zmeškaný hovor od %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>Já</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nová zpráva</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Žádosti o důvěru</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Soukromý</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Soukromá skupina (omezené pozvánky)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Soukromá skupina</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Veřejná skupina</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Při načítání tohoto úložiště došlo k chybě.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Režim konverzace není rozpoznán.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Byla zjištěna neplatná zpráva</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Nedostatečné oprávnění pro aktualizaci informací o konverzaci</translation>
</message>
@@ -3198,32 +3198,17 @@ Zkopírujte je a sdílejte je se svými přáteli!</translation>
<translation>Dokončeno</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>před %1 dnem</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Dnes</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>včera</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Včera</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>před %1 hodinou</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>před hodinou</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>před %1 minutou</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>teď</translation>
</message>
@@ -3700,132 +3685,132 @@ Zkopírujte je a sdílejte je se svými přáteli!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Upravit</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Co znamená Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>Co znamená zelená tečka vedle mého účtu?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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>Volba názvu Jami byla inspirována svahilským slovem "jamii", které znamená podstatné jméno "komunita" a příslovce "společně".</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Zálohovat účet</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Červená tečka znamená, že je váš účet odpojen od sítě; když je připojen, změní se na zelenou.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Proč bych měl zálohovat svůj účet?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami je distribuována a váš účet je uložen pouze lokálně ve vašem zařízení. Pokud ztratíte heslo nebo místní data účtu, NEBUDE možné účet obnovit, pokud jste si jej dříve nezálohovali.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Mohu uskutečnit konferenční hovor?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Má Jami skupinové chaty?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Co je účet Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Účet Jami je asymetrický šifrovací klíč. Váš účet je identifikován pomocí ID Jami, což je otisk vašeho veřejného klíče.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Jaké údaje musím poskytnout pro vytvoření účtu Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Při vytváření nového účtu Jami nemusíte uvádět žádné soukromé údaje, jako je e-mail, adresa nebo telefonní číslo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>V aplikaci Jami je váš účet uložen v adresáři ve vašem zařízení. Heslo se používá pouze k zašifrování účtu, abyste byli chráněni před někým, kdo má fyzický přístup k vašemu zařízení.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Váš účet je uložen pouze ve vašich zařízeních. Pokud účet odstraníte ze všech svých zařízení, je navždy ztracen a nelze jej obnovit.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Mohu svůj účet používat na více zařízeních?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Ano, účet můžete propojit v nastavení nebo můžete importovat zálohu z jiného zařízení.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>Proč nemusím používat heslo?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>V hovoru můžete kliknutím na možnost "Přidat účastníky" přidat kontakt do hovoru.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>Proč si nemusím registrovat uživatelské jméno?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>Nejstálejším a nejbezpečnějším identifikátorem je vaše Jami ID, ale protože je pro některé lidi obtížné je používat, máte také možnost zaregistrovat si uživatelské jméno.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Jak mohu svůj účet zálohovat?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>V Nastavení účtu je k dispozici tlačítko pro vytvoření zálohy účtu.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Co se stane, když svůj účet odstraním?</translation>
</message>
diff --git a/translations/ring_client_windows_da.ts b/translations/ring_client_windows_da.ts
index 7aefcc2d3..00852669d 100644
--- a/translations/ring_client_windows_da.ts
+++ b/translations/ring_client_windows_da.ts
@@ -12,7 +12,7 @@
<translation>Ubesvaret opkald fra %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>mig</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Ny besked</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Hav tillid til anmodning</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3187,32 +3187,17 @@ Kopier og del det med dine venner!</translation>
<translation>Afsluttet</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>I dag</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>I går</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3689,132 +3674,132 @@ Kopier og del det med dine venner!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts
index d9bb94f6f..1155f97b0 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -58,42 +58,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3188,32 +3188,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3690,132 +3675,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index 180e8946f..6d3c57923 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -12,7 +12,7 @@
<translation>entgangener Anruf mit %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>Ich</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Neue Nachricht</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Anfrage vertrauen</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>private Gruppe (eingeschränkte Einladungen)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>private Gruppe</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>öffentliche Gruppe</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Beim Abrufen dieses Repositorys ist ein Fehler aufgetreten</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Der Unterhaltungsmodus wird nicht erkannt</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Eine ungültige Nachricht wurde erkannt</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Nicht genügend Autorisierung zum Aktualisieren der Unterhaltungsinformationen</translation>
</message>
@@ -3198,32 +3198,17 @@ Kopieren und teilen Sie diesen mit Ihren Freunden!</translation>
<translation>Abgeschlossen</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>vor %1 Tagen</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Heute</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>vor einem Tag</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Gestern</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>vor %1 Stunde</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>vor einer Stunde</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>vor %1 Minute</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>gerade eben</translation>
</message>
@@ -3700,132 +3685,132 @@ Kopieren und teilen Sie diesen mit Ihren Freunden!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Anpassen</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Was bedeutet Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 durch das Suaheli-Wort „jamii“ inspiriert, was als Substantiv „Gemeinschaft“ und als Adverb „zusammen“ bedeutet.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Konto sichern</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Ein roter Punkt bedeutet, dass Ihr Konto vom Netzwerk getrennt ist; er wird grün, wenn es verbunden ist.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Warum sollte ich mein Konto sichern?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami wird verteilt und Ihr Konto wird nur lokal auf Ihrem Gerät gespeichert. Wenn Sie Ihr Passwort oder Ihre lokalen Kontodaten verlieren, können Sie Ihr Konto NICHT wiederherstellen, wenn Sie es nicht vorher gesichert haben.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Kann ich einen Konferenzanruf machen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Hat Jami Gruppenchats?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Was ist ein Jami-Account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Wenn Sie ein neues Jami-Konto erstellen, müssen Sie keine privaten Informationen wie E-Mail, Adresse oder Telefonnummer angeben.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Bei Jami wird Ihr Konto in einem Verzeichnis auf Ihrem Gerät gespeichert. Das Passwort wird nur zum Verschlüsseln Ihres Kontos verwendet, um Sie vor jemandem zu schützen, der physischen Zugriff auf Ihr Gerät hat.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Ihr Konto wird nur auf Ihren eigenen Geräten gespeichert. Wenn Sie Ihr Konto von allen Ihren Geräten löschen, ist das Konto für immer weg und Sie können es NICHT wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Kann ich mein Konto auf mehreren Geräten verwenden?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>In den Kontoeinstellungen ist ein Button verfügbar, um ein Backup Ihres Kontos zu erstellen.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Was passiert, wenn ich mein Konto lösche?</translation>
</message>
diff --git a/translations/ring_client_windows_de_DE.ts b/translations/ring_client_windows_de_DE.ts
index 109e14e89..90c83eb15 100644
--- a/translations/ring_client_windows_de_DE.ts
+++ b/translations/ring_client_windows_de_DE.ts
@@ -12,7 +12,7 @@
<translation>entgangener Anruf mit %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>ich</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Neue Nachricht</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Vertrauensbeweis gefordert</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>private Gruppe (eingeschränkte Einladungen)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>private Gruppe</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>öffentliche Gruppe</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Beim Abrufen dieses Repositorys ist ein Fehler aufgetreten</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Der Unterhaltungsmodus wird nicht erkannt</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Eine ungültige Nachricht wurde erkannt</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Nicht genügend Autorisierung zum Aktualisieren der Unterhaltungsinformationen</translation>
</message>
@@ -3198,32 +3198,17 @@ Kopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!</translation>
<translation>Erledigt</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>vor %1 Tagen</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Heute</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>vor einem Tag</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Gestern</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>vor %1 Stunde</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>vor einer Stunde</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>vor %1 Minute</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>gerade eben</translation>
</message>
@@ -3700,132 +3685,132 @@ Kopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Anpassen</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Was bedeutet Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 durch das Suaheli-Wort „jamii“ inspiriert, was als Substantiv „Gemeinschaft“ und als Adverb „zusammen“ bedeutet.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Konto sichern</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Ein roter Punkt bedeutet, dass Ihr Konto vom Netzwerk getrennt ist; er wird grün, wenn es verbunden ist.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Warum sollte ich mein Konto sichern?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami wird verteilt und Ihr Konto wird nur lokal auf Ihrem Gerät gespeichert. Wenn Sie Ihr Passwort oder Ihre lokalen Kontodaten verlieren, können Sie Ihr Konto NICHT wiederherstellen, wenn Sie es nicht vorher gesichert haben.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Kann ich einen Konferenzanruf machen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Hat Jami Gruppenchats?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Was ist ein Jami-Account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Wenn Sie ein neues Jami-Konto erstellen, müssen Sie keine privaten Informationen wie E-Mail, Adresse oder Telefonnummer angeben.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Bei Jami wird Ihr Konto in einem Verzeichnis auf Ihrem Gerät gespeichert. Das Passwort wird nur zum Verschlüsseln Ihres Kontos verwendet, um Sie vor jemandem zu schützen, der physischen Zugriff auf Ihr Gerät hat.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Ihr Konto wird nur auf Ihren eigenen Geräten gespeichert. Wenn Sie Ihr Konto von allen Ihren Geräten löschen, ist das Konto für immer weg und Sie können es NICHT wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Kann ich mein Konto auf mehreren Geräten verwenden?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>In den Kontoeinstellungen ist ein Button verfügbar, um ein Backup Ihres Kontos zu erstellen.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Was passiert, wenn ich mein Konto lösche?</translation>
</message>
diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts
index a397bb15b..a50c467f3 100644
--- a/translations/ring_client_windows_el.ts
+++ b/translations/ring_client_windows_el.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>μία ημέρα πρίν</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Σήμερα</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>μία ώρα πρίν</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Χθες</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Μόλις τώρα</translation>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_en_CA.ts b/translations/ring_client_windows_en_CA.ts
index 9fe5d1199..72d4db6bc 100644
--- a/translations/ring_client_windows_en_CA.ts
+++ b/translations/ring_client_windows_en_CA.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -58,42 +58,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3188,32 +3188,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3690,132 +3675,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts
index be3f782ee..914992738 100644
--- a/translations/ring_client_windows_en_GB.ts
+++ b/translations/ring_client_windows_en_GB.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -58,42 +58,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3188,32 +3188,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3690,132 +3675,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_en_IE.ts b/translations/ring_client_windows_en_IE.ts
index f37330cfe..35b86f541 100644
--- a/translations/ring_client_windows_en_IE.ts
+++ b/translations/ring_client_windows_en_IE.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -58,42 +58,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3188,32 +3188,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3690,132 +3675,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts
index 5d48ee7ec..db76fd06c 100644
--- a/translations/ring_client_windows_eo.ts
+++ b/translations/ring_client_windows_eo.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hodiaŭ</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hieraŭ</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts
index 73353309f..a0a0e9df4 100644
--- a/translations/ring_client_windows_es.ts
+++ b/translations/ring_client_windows_es.ts
@@ -12,7 +12,7 @@
<translation>Llamada perdida con %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>yo</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nuevo mensaje</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Solicitud de confianza</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grupo privado (invitaciones limitadas)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grupo privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grupo público</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Ha ocurrido un error al buscar en este repositorio</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Modo de conversación desconocido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Se ha detectado un mensaje inválido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Sin autorización para actualizar la info de la conversación</translation>
</message>
@@ -3197,32 +3197,17 @@ Copy and share it with your friends!</source>
<translation>Terminado</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Hace %1 días</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoy</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>hace un día</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ayer</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Hace %1 horas</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>hace una hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Hace %1 minutos</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>justo ahora</translation>
</message>
@@ -3699,132 +3684,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizar</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>¿Qué significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>¿Qué representa el punto verde al lado de mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 elección del nombre Jami está inspirada en la palabra swahili "jamii", que significa "comunidad" como sustantivo y "juntos" como adjetivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Crear respaldo de la cuenta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rojo significa que tu cuenta está desconectada de la red; se pone verde cuando está conectada.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>¿Por qué debería respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami es distribuido y tu cuenta sólo se guarda localmente en tu dispositivo. Si perdés tu contraseña o tus datos locales, NO podrás recuperar tu cuenta si previamente no la habías respaldado.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>¿Puedo hacer una videoconferencia?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>¿Hay conversaciones grupales en Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>En las configuraciones podés habilitar el soporte para grupos (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>¿Qué es una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Una cuenta de Jami es una clave de cifrado asimétrico. Tu cuenta se identifica mediante un ID de Jami, el cual es la huella digital de tu clave pública.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>¿Qué información necesito dar para crear una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Cuando creás una nueva cuenta de Jami, no tenés que brindar ningún tipo de información privada como email, dirección o número de teléfono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>En Jami tu cuenta se guarda en una carpeta en tu dispositivo. La contraseña sólo se usa para cifrar tu cuenta para protegerte de alguien que tenga acceso físico a tu dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Tu cuenta sólo se guarda en tus dispositivos. Si la borrás de todos los dispositivos, se perderá para siempre y NO podrás recuperarla.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>¿Puedo usar mi cuenta desde múltiples dispositivos?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sí, podés vincular tu cuenta desde las configuraciones o podés importar tu respaldo en otro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>¿Por qué no necesito usar una contraseña?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>En una llamada, puede hacer clic en "Agregar participantes" para agregar un contacto.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>¿Por qué no necesito registrar un nombre de usuario?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>El identificador más seguro y permanente es tu ID de Jami, pero como es difícil de usar para algunas personas, también tenés la opción de registrar un nombre de usuario.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>¿Cómo puedo respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>En Configuración de la cuenta, hay un botón disponible para crear una copia de seguridad de su cuenta.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>¿Qué pasa cuando borro mi cuenta?</translation>
</message>
diff --git a/translations/ring_client_windows_es_AR.ts b/translations/ring_client_windows_es_AR.ts
index 811a6029b..fa228368d 100644
--- a/translations/ring_client_windows_es_AR.ts
+++ b/translations/ring_client_windows_es_AR.ts
@@ -12,7 +12,7 @@
<translation>Llamada perdida con %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>yo</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nuevo mensaje</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Solicitud de confianza</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grupo privado (invitaciones limitadas)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grupo privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grupo público</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Ha ocurrido un error al buscar en este repositorio</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Modo de conversación desconocido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Se ha detectado un mensaje inválido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Sin autorización para actualizar la info de la conversación</translation>
</message>
@@ -3197,32 +3197,17 @@ Copy and share it with your friends!</source>
<translation>Finalizado</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>hace %1 días</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoy</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>hace un día</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ayer</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>hace %1 horas</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>hace una hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>hace %1 minutos</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>hace un momento</translation>
</message>
@@ -3699,132 +3684,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizar</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>¿Qué significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>¿Qué representa el punto verde al lado de mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 elección del nombre Jami está inspirada en la palabra swahili "jamii", que significa "comunidad" como sustantivo y "juntos" como adjetivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Crear respaldo de la cuenta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rojo significa que tu cuenta está desconectada de la red; se pone verde cuando está conectada.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>¿Por qué debería respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami es distribuido y tu cuenta sólo se guarda localmente en tu dispositivo. Si perdés tu contraseña o tus datos locales, NO podrás recuperar tu cuenta si previamente no la habías respaldado.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>¿Puedo hacer una videoconferencia?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>¿Hay conversaciones grupales en Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>En las configuraciones podés habilitar el soporte para grupos (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>¿Qué es una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Una cuenta de Jami es una clave de cifrado asimétrico. Tu cuenta se identifica mediante un ID de Jami, el cual es la huella digital de tu clave pública.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>¿Qué información necesito dar para crear una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Cuando creás una nueva cuenta de Jami, no tenés que brindar ningún tipo de información privada como email, dirección o número de teléfono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>En Jami tu cuenta se guarda en una carpeta en tu dispositivo. La contraseña sólo se usa para cifrar tu cuenta para protegerte de alguien que tenga acceso físico a tu dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Tu cuenta sólo se guarda en tus dispositivos. Si la borrás de todos los dispositivos, se perderá para siempre y NO podrás recuperarla.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>¿Puedo usar mi cuenta desde múltiples dispositivos?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sí, podés vincular tu cuenta desde las configuraciones o podés importar tu respaldo en otro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>¿Por qué no necesito usar una contraseña?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>En una llamada, puede hacer clic en "Agregar participantes" para agregar un contacto.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>¿Por qué no necesito registrar un nombre de usuario?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>El identificador más seguro y permanente es tu ID de Jami. Pero, como es difícil de usar para algunas personas, también tenés la opción de registrar un nombre de usuario.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>¿Cómo puedo respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>En Configuración de la cuenta, hay un botón disponible para crear una copia de seguridad de su cuenta.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>¿Qué pasa cuando borro mi cuenta?</translation>
</message>
diff --git a/translations/ring_client_windows_es_CO.ts b/translations/ring_client_windows_es_CO.ts
index 60ddaeb66..565e8de1c 100644
--- a/translations/ring_client_windows_es_CO.ts
+++ b/translations/ring_client_windows_es_CO.ts
@@ -12,7 +12,7 @@
<translation>Llamada perdida con %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>yo</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Mensaje nuevo</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Petición de confianza</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grupo privado (invitaciones limitadas)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grupo privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grupo público</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Ha ocurrido un error al buscar en este repositorio</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Modo de conversación desconocido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Se ha detectado un mensaje inválido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Sin autorización para actualizar la info de la conversación</translation>
</message>
@@ -3197,32 +3197,17 @@ Copy and share it with your friends!</source>
<translation>Finalizado</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Hace %1 días</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoy</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>hace un día</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ayer</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Hace %1 horas</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>hace una hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Hace %1 minutos</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>hace unos segundos</translation>
</message>
@@ -3699,132 +3684,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizar</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>¿Qué significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>¿Qué representa el punto verde al lado de mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 elección del nombre Jami está inspirada en la palabra swahili "jamii", que significa "comunidad" como sustantivo y "juntos" como adjetivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Crear respaldo de la cuenta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rojo significa que tu cuenta está desconectada de la red; se pone verde cuando está conectada.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>¿Por qué debería respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami es distribuido y tu cuenta sólo se guarda localmente en tu dispositivo. Si perdés tu contraseña o tus datos locales, NO podrás recuperar tu cuenta si previamente no la habías respaldado.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>¿Puedo hacer una videoconferencia?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>¿Hay conversaciones grupales en Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>En las configuraciones podés habilitar el soporte para grupos (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>¿Qué es una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Una cuenta de Jami es una clave de cifrado asimétrico. Tu cuenta se identifica mediante un ID de Jami, el cual es la huella digital de tu clave pública.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>¿Qué información necesito dar para crear una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Cuando creás una nueva cuenta de Jami, no tenés que brindar ningún tipo de información privada como email, dirección o número de teléfono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>En Jami tu cuenta se guarda en una carpeta en tu dispositivo. La contraseña sólo se usa para cifrar tu cuenta para protegerte de alguien que tenga acceso físico a tu dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Tu cuenta sólo se guarda en tus dispositivos. Si la borrás de todos los dispositivos, se perderá para siempre y NO podrás recuperarla.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>¿Puedo usar mi cuenta desde múltiples dispositivos?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sí, podés vincular tu cuenta desde las configuraciones o podés importar tu respaldo en otro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>¿Por qué no necesito usar una contraseña?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>En una llamada, puede hacer clic en "Agregar participantes" para agregar un contacto.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>¿Por qué no necesito registrar un nombre de usuario?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>El identificador más seguro y permanente es tu ID de Jami, pero como es difícil de usar para algunas personas, también tenés la opción de registrar un nombre de usuario.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>¿Cómo puedo respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>En Configuración de la cuenta, hay un botón disponible para crear una copia de seguridad de su cuenta.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>¿Qué pasa cuando borro mi cuenta?</translation>
</message>
diff --git a/translations/ring_client_windows_es_MX.ts b/translations/ring_client_windows_es_MX.ts
index a675f51a9..be7ca8cd1 100644
--- a/translations/ring_client_windows_es_MX.ts
+++ b/translations/ring_client_windows_es_MX.ts
@@ -12,7 +12,7 @@
<translation>Llamada perdida con %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>yo</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Mensaje nuevo</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Solicitud de confianza</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grupo privado (invitaciones limitadas)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grupo privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grupo público</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Ha ocurrido un error al buscar en este repositorio</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Modo de conversación desconocido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Se ha detectado un mensaje inválido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Sin autorización para actualizar la info de la conversación</translation>
</message>
@@ -3197,32 +3197,17 @@ Copy and share it with your friends!</source>
<translation>Finalizado</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Hace %1 días</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoy</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>hace un día</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ayer</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Hace %1 horas</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>hace una hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Hace %1 minutos</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>hace un momento</translation>
</message>
@@ -3699,132 +3684,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizar</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>¿Qué significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>¿Qué representa el punto verde al lado de mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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 elección del nombre Jami está inspirada en la palabra swahili "jamii", que significa "comunidad" como sustantivo y "juntos" como adjetivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Crear respaldo de la cuenta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rojo significa que tu cuenta está desconectada de la red; se pone verde cuando está conectada.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>¿Por qué debería respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami es distribuido y tu cuenta sólo se guarda localmente en tu dispositivo. Si perdés tu contraseña o tus datos locales, NO podrás recuperar tu cuenta si previamente no la habías respaldado.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>¿Puedo hacer una videoconferencia?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>¿Hay conversaciones grupales en Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>En las configuraciones podés habilitar el soporte para grupos (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>¿Qué es una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Una cuenta de Jami es una clave de cifrado asimétrico. Tu cuenta se identifica mediante un ID de Jami, el cual es la huella digital de tu clave pública.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>¿Qué información necesito dar para crear una cuenta de Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Cuando creás una nueva cuenta de Jami, no tenés que brindar ningún tipo de información privada como email, dirección o número de teléfono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>En Jami tu cuenta se guarda en una carpeta en tu dispositivo. La contraseña sólo se usa para cifrar tu cuenta para protegerte de alguien que tenga acceso físico a tu dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Tu cuenta sólo se guarda en tus dispositivos. Si la borrás de todos los dispositivos, se perderá para siempre y NO podrás recuperarla.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>¿Puedo usar mi cuenta desde múltiples dispositivos?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sí, podés vincular tu cuenta desde las configuraciones o podés importar tu respaldo en otro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>¿Por qué no necesito usar una contraseña?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>En una llamada, puede hacer clic en "Agregar participantes" para agregar un contacto.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>¿Por qué no necesito registrar un nombre de usuario?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>El identificador más seguro y permanente es tu ID de Jami, pero como es difícil de usar para algunas personas, también tenés la opción de registrar un nombre de usuario.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>¿Cómo puedo respaldar mi cuenta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>En Configuración de la cuenta, hay un botón disponible para crear una copia de seguridad de su cuenta.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>¿Qué pasa cuando borro mi cuenta?</translation>
</message>
diff --git a/translations/ring_client_windows_et.ts b/translations/ring_client_windows_et.ts
index dda0bf266..64ff53529 100644
--- a/translations/ring_client_windows_et.ts
+++ b/translations/ring_client_windows_et.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts
index c65913b4c..57c2156c1 100644
--- a/translations/ring_client_windows_et_EE.ts
+++ b/translations/ring_client_windows_et_EE.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_eu.ts b/translations/ring_client_windows_eu.ts
index 6d644fe28..5b37a841f 100644
--- a/translations/ring_client_windows_eu.ts
+++ b/translations/ring_client_windows_eu.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Atzo</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Egin kontuaren babes-kopia</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fa.ts b/translations/ring_client_windows_fa.ts
index cecf18bc9..0fdd224a4 100644
--- a/translations/ring_client_windows_fa.ts
+++ b/translations/ring_client_windows_fa.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>من</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>پیام جدید</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>درخواست اعتماد</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3190,32 +3190,17 @@ Copy and share it with your friends!</source>
<translation>پایان یافته</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>یک روز پیش</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>امروز</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>یک ساعت پیش</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>دیروز</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>همین الان</translation>
</message>
@@ -3692,132 +3677,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>پشتیبانگیری حساب</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fa_IR.ts b/translations/ring_client_windows_fa_IR.ts
index 31b89e609..c9c40fb51 100644
--- a/translations/ring_client_windows_fa_IR.ts
+++ b/translations/ring_client_windows_fa_IR.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>من</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>پیام جدید</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>درخواست اعتماد</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3190,32 +3190,17 @@ Copy and share it with your friends!</source>
<translation>پایان یافته</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>یک روز پیش</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>امروز</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>یک ساعت پیش</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>دیروز</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>همین الان</translation>
</message>
@@ -3692,132 +3677,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>پشتیبانگیری حساب</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts
index bb3ac59b3..b1c111a49 100644
--- a/translations/ring_client_windows_fi.ts
+++ b/translations/ring_client_windows_fi.ts
@@ -12,7 +12,7 @@
<translation>Vastaamaton puhelu %1 :lta</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>minä</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Uusi viesti</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Luottamuspyyntö</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3193,32 +3193,17 @@ Kopioi ja jaa se ystäviesi kanssa!</translation>
<translation>Valmis</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 päivää sitten</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Tänään</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>yksi päivä sitten</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Eilen</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 tuntia sitten</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>yksi tunti sitten</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minuuttia sitten</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juuri nyt</translation>
</message>
@@ -3695,132 +3680,132 @@ Kopioi ja jaa se ystäviesi kanssa!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Varmuuskopioi tunnus</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts
index ecb5bb66a..0b850fe4d 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -12,7 +12,7 @@
<translation>Vous avez manqué un appel de %1 </translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>moi</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nouveau message</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Invitation</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Groupe privé (sur invitation)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Groupe privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Groupe publique</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Une erreur s'est produite lors de la récupération de ce référentiel.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Le mode de la conversation n'est pas reconnu.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Un message invalide a été détecté</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Droits insuffisants pour mettre à jour les infos de la conversation</translation>
</message>
@@ -3197,32 +3197,17 @@ Copy and share it with your friends!</source>
<translation>Complété</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Il y a %1 jour(s)</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Aujourd'hui</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>il y a une journée</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hier</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Il y a %1 heure(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>il y a une heure</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Il y a %1 minute(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juste maintenant</translation>
</message>
@@ -3699,132 +3684,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Paramétrer</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sauvegarder le compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un point rouge signifie que votre compte est déconnecté du réseau ; il devient vert lorsqu'il est connecté.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pourquoi dois-je faire une sauvegarde de mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami est distribué et votre compte n'est stocké que localement sur votre appareil. Si vous perdez votre mot de passe ou les données de votre compte local, vous NE POURREZ PAS récupérer votre compte si vous ne l'avez pas sauvegardé auparavant.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<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="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<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="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Avec Jami, votre compte est stocké dans un répertoire 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Votre compte est uniquement stocké sur vos propres appareils. Si vous supprimez votre compte de tous vos appareils, le compte est perdu à jamais et vous ne pouvez pas le récupérer.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Oui, vous pouvez lier votre compte à partir des paramètres, ou vous pouvez importer votre sauvegarde sur un autre appareil.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dans un appel, vous pouvez cliquer sur "Ajouter des participants" pour ajouter un contact à un appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dans les paramètres du compte, un bouton est disponible pour créer une sauvegarde de votre compte.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
diff --git a/translations/ring_client_windows_fr_BE.ts b/translations/ring_client_windows_fr_BE.ts
index 9b898e6b1..2b9b59542 100644
--- a/translations/ring_client_windows_fr_BE.ts
+++ b/translations/ring_client_windows_fr_BE.ts
@@ -12,7 +12,7 @@
<translation>Vous avez manqué un appel de %1 </translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>moi</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nouveau message</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Invitation</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Groupe privé (sur invitation)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Groupe privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Groupe publique</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Une erreur s'est produite lors de la récupération de ce référentiel.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Le mode de la conversation n'est pas reconnu.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Un message invalide a été détecté</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Droits insuffisants pour mettre à jour les infos de la conversation</translation>
</message>
@@ -3197,32 +3197,17 @@ Copy and share it with your friends!</source>
<translation>Terminé</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Il y a %1 jour(s)</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Aujourd'hui</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>il y a une journée</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hier</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Il y a %1 heure(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>il y a une heure</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Il y a %1 minute(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juste maintenant</translation>
</message>
@@ -3699,132 +3684,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Paramétrer</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sauvegarder le compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un point rouge signifie que votre compte est déconnecté du réseau ; il devient vert lorsqu'il est connecté.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pourquoi dois-je faire une sauvegarde de mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami est distribué et votre compte n'est stocké que localement sur votre appareil. Si vous perdez votre mot de passe ou les données de votre compte local, vous NE POURREZ PAS récupérer votre compte si vous ne l'avez pas sauvegardé auparavant.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<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="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<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="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Avec Jami, votre compte est stocké dans un répertoire 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Votre compte est uniquement stocké sur vos propres appareils. Si vous supprimez votre compte de tous vos appareils, le compte est perdu à jamais et vous ne pouvez pas le récupérer.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Oui, vous pouvez lier votre compte à partir des paramètres, ou vous pouvez importer votre sauvegarde sur un autre appareil.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dans un appel, vous pouvez cliquer sur "Ajouter des participants" pour ajouter un contact à un appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dans les paramètres du compte, un bouton est disponible pour créer une sauvegarde de votre compte.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
diff --git a/translations/ring_client_windows_fr_CA.ts b/translations/ring_client_windows_fr_CA.ts
index 2b36bdea6..4877ccfa2 100644
--- a/translations/ring_client_windows_fr_CA.ts
+++ b/translations/ring_client_windows_fr_CA.ts
@@ -12,7 +12,7 @@
<translation>Vous avez manqué un appel de %1 </translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>moi</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nouveau message</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Invitation</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Groupe privé (sur invitation)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Groupe privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Groupe publique</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Une erreur s'est produite lors de la récupération de ce référentiel.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Le mode de la conversation n'est pas reconnu.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Un message invalide a été détecté</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Droits insuffisants pour mettre à jour les infos de la conversation</translation>
</message>
@@ -3197,32 +3197,17 @@ Copy and share it with your friends!</source>
<translation>Terminé</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Il y a %1 jour(s)</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Aujourd'hui</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>il y a une journée</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hier</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Il y a %1 heure(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>il y a une heure</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Il y a %1 minute(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juste maintenant</translation>
</message>
@@ -3699,132 +3684,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Paramétrer</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sauvegarder le compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un point rouge signifie que votre compte est déconnecté du réseau ; il devient vert lorsqu'il est connecté.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pourquoi dois-je faire une sauvegarde de mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami est distribué et votre compte n'est stocké que localement sur votre appareil. Si vous perdez votre mot de passe ou les données de votre compte local, vous NE POURREZ PAS récupérer votre compte si vous ne l'avez pas sauvegardé auparavant.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<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="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<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="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Avec Jami, votre compte est stocké dans un répertoire 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Votre compte est uniquement stocké sur vos propres appareils. Si vous supprimez votre compte de tous vos appareils, le compte est perdu à jamais et vous ne pouvez pas le récupérer.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Oui, vous pouvez lier votre compte à partir des paramètres, ou vous pouvez importer votre sauvegarde sur un autre appareil.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dans un appel, vous pouvez cliquer sur "Ajouter des participants" pour ajouter un contact à un appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dans les paramètres du compte, un bouton est disponible pour créer une sauvegarde de votre compte.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
diff --git a/translations/ring_client_windows_fr_CH.ts b/translations/ring_client_windows_fr_CH.ts
index 768b6ea22..965498135 100644
--- a/translations/ring_client_windows_fr_CH.ts
+++ b/translations/ring_client_windows_fr_CH.ts
@@ -12,7 +12,7 @@
<translation>Vous avez manqué un appel de %1 </translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>moi</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nouveau message</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Invitation</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Groupe privé (sur invitation)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Groupe privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Groupe publique</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Une erreur s'est produite lors de la récupération de ce référentiel.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Le mode de la conversation n'est pas reconnu.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Un message invalide a été détecté</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Droits insuffisants pour mettre à jour les infos de la conversation</translation>
</message>
@@ -3197,32 +3197,17 @@ Copy and share it with your friends!</source>
<translation>Terminé</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Il y a %1 jour(s)</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Aujourd'hui</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>il y a une journée</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hier</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Il y a %1 heure(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>il y a une heure</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Il y a %1 minute(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juste maintenant</translation>
</message>
@@ -3699,132 +3684,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Paramétrer</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sauvegarder le compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un point rouge signifie que votre compte est déconnecté du réseau ; il devient vert lorsqu'il est connecté.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pourquoi dois-je faire une sauvegarde de mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami est distribué et votre compte n'est stocké que localement sur votre appareil. Si vous perdez votre mot de passe ou les données de votre compte local, vous NE POURREZ PAS récupérer votre compte si vous ne l'avez pas sauvegardé auparavant.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<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="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<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="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Avec Jami, votre compte est stocké dans un répertoire 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Votre compte est uniquement stocké sur vos propres appareils. Si vous supprimez votre compte de tous vos appareils, le compte est perdu à jamais et vous ne pouvez pas le récupérer.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Oui, vous pouvez lier votre compte à partir des paramètres, ou vous pouvez importer votre sauvegarde sur un autre appareil.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dans un appel, vous pouvez cliquer sur "Ajouter des participants" pour ajouter un contact à un appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dans les paramètres du compte, un bouton est disponible pour créer une sauvegarde de votre compte.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
diff --git a/translations/ring_client_windows_fr_FR.ts b/translations/ring_client_windows_fr_FR.ts
index d588f6824..aca2cfc96 100644
--- a/translations/ring_client_windows_fr_FR.ts
+++ b/translations/ring_client_windows_fr_FR.ts
@@ -12,7 +12,7 @@
<translation>Vous avez manqué un appel de %1 </translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>moi</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nouveau message</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Invitation</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Groupe privé (sur invitation)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Groupe privé</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Groupe publique</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Une erreur s'est produite lors de la récupération de ce référentiel.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Le mode de la conversation n'est pas reconnu.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Un message invalide a été détecté</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Droits insuffisants pour mettre à jour les infos de la conversation</translation>
</message>
@@ -3197,32 +3197,17 @@ Copy and share it with your friends!</source>
<translation>Terminé</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Il y a %1 jour(s)</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Aujourd'hui</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>il y a une journée</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Hier</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Il y a %1 heure(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>il y a une heure</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Il y a %1 minute(s)</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>juste maintenant</translation>
</message>
@@ -3699,132 +3684,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Paramétrer</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sauvegarder le compte</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un point rouge signifie que votre compte est déconnecté du réseau ; il devient vert lorsqu'il est connecté.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pourquoi dois-je faire une sauvegarde de mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami est distribué et votre compte n'est stocké que localement sur votre appareil. Si vous perdez votre mot de passe ou les données de votre compte local, vous NE POURREZ PAS récupérer votre compte si vous ne l'avez pas sauvegardé auparavant.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<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="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<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="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Avec Jami, votre compte est stocké dans un répertoire 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Votre compte est uniquement stocké sur vos propres appareils. Si vous supprimez votre compte de tous vos appareils, le compte est perdu à jamais et vous ne pouvez pas le récupérer.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Oui, vous pouvez lier votre compte à partir des paramètres, ou vous pouvez importer votre sauvegarde sur un autre appareil.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dans un appel, vous pouvez cliquer sur "Ajouter des participants" pour ajouter un contact à un appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dans les paramètres du compte, un bouton est disponible pour créer une sauvegarde de votre compte.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
diff --git a/translations/ring_client_windows_ga.ts b/translations/ring_client_windows_ga.ts
index b05ec4939..024548999 100644
--- a/translations/ring_client_windows_ga.ts
+++ b/translations/ring_client_windows_ga.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_gl.ts b/translations/ring_client_windows_gl.ts
index d6c4e702a..041dbd5c8 100644
--- a/translations/ring_client_windows_gl.ts
+++ b/translations/ring_client_windows_gl.ts
@@ -12,7 +12,7 @@
<translation>Chamada perdida de %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nova mensaxe</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Confiar na solicitude</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grupo privado (convites restrinxidos)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grupo privado</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grupo público</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Houbo un fallo ao obter este repositorio</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>O modo da conversa non é recoñecible</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Detectouse unha mensaxe non válida</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Non hai permiso suficiente para actualizar a info da conversa</translation>
</message>
@@ -3189,32 +3189,17 @@ Copiao e compárteo coas túas amizades!</translation>
<translation>Rematada</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>fai un día</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Onte</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>fai unha hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>xusto agora</translation>
</message>
@@ -3691,132 +3676,132 @@ Copiao e compárteo coas túas amizades!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizar</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Copia de apoio da conta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Por que é recomendable facer copia de apoio?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Podo facer videochamadas?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Cando creas unha conta Jami non tes que proporcionar ningunha información privada como email, enderezo ou número de teléfono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>O identificador máis seguro e permanente é o teu Jami ID, pero como é complicado de lembrar e usar, tamén tes a opción de rexistrar un nome de usuaria.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_gu.ts b/translations/ring_client_windows_gu.ts
index 1bba9a285..1764bed8c 100644
--- a/translations/ring_client_windows_gu.ts
+++ b/translations/ring_client_windows_gu.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts
index 4723454cc..a7607b7aa 100644
--- a/translations/ring_client_windows_he.ts
+++ b/translations/ring_client_windows_he.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>לפני יום</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>היום</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>לפני שעה</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>אתמול</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_hi.ts b/translations/ring_client_windows_hi.ts
index 640a6f35a..fed7e625d 100644
--- a/translations/ring_client_windows_hi.ts
+++ b/translations/ring_client_windows_hi.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts
index fd235af17..9700cbd52 100644
--- a/translations/ring_client_windows_hi_IN.ts
+++ b/translations/ring_client_windows_hi_IN.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts
index 6e7c85baf..8cd014996 100644
--- a/translations/ring_client_windows_hr.ts
+++ b/translations/ring_client_windows_hr.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Danas</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Jučer</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts
index 61acccadc..589820a30 100644
--- a/translations/ring_client_windows_hu.ts
+++ b/translations/ring_client_windows_hu.ts
@@ -12,7 +12,7 @@
<translation>Nem fogadott hívás a következővel: %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>én</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Új üzenet</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Megbízható kérelem</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Magánjellegű</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Személyes csoport (korlátozott meghívók)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Személyes csoport</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Nyilvános csoport</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Hiba történt az adattár lekérése közben</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Felismeretlen beszélgetési mód</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Érvénytelen üzenet észlelve</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Nincs jogosultság a beszélgetési adatok frissítésére</translation>
</message>
@@ -3197,32 +3197,17 @@ Másolja ki, és ossza meg barátaival!</translation>
<translation>Befejezett</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 napja</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Ma</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>egy napja</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Tegnap</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 órája</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>egy órája</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 perce</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>most</translation>
</message>
@@ -3699,132 +3684,132 @@ Másolja ki, és ossza meg barátaival!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Testreszabás</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Mit jelent a Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fiók biztonsági mentése</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Miért szükséges biztonsági másolatot készíteni egy fiókról?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>A Jami el van osztva, és fiókja csak helyileg tárolódik az eszközén. Ha elveszíti jelszavát vagy helyi fiókadatait, nem tudja visszaállítani fiókját, ha korábban nem készített biztonsági másolatot.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Indíthatok konferenciahívást?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Van Jaminak csoportos csevegése?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Mi az a Jami-fiók?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Ú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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Fiókját csak a saját eszközei tárolják. Ha törli fiókját az összes eszközéről, a fiók végleg eltűnik, és nem lehet helyreállítani.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Használható egy fiók több eszközön?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>A fiókbeállításokban elérhető egy gomb a fiók biztonsági másolatának létrehozásához.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Mi történik a fiók törlésekor?</translation>
</message>
diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts
index 00700d308..ad47ff39a 100644
--- a/translations/ring_client_windows_id.ts
+++ b/translations/ring_client_windows_id.ts
@@ -12,7 +12,7 @@
<translation>Panggilan terlewat dari %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>saya</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Pesan baru</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Permintaan kepercayaan</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grup privat (undangan terbatas)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grup privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grup publik</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Terjadi error saat mengambil repositori ini</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Modus percakapan tidak dikenali</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Pesan yang tidak valid terdeteksi</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Tidak cukup otorisasi untuk memperbarui info percakapan</translation>
</message>
@@ -3194,32 +3194,17 @@ Salin dan bagikan dengan teman-teman Anda!</translation>
<translation>Selesai</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 hari yang lalu</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hari ini</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>satu hari yang lalu</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Kemarin</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 jam yang lalu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>satu jam yang lalu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 menit yang lalu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Baru saja</translation>
</message>
@@ -3696,132 +3681,132 @@ Salin dan bagikan dengan teman-teman Anda!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Sesuaikan</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Apa yang dimaksud dengan Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>Apakah titik hijau di samping akun saya?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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>Pemilihan nama Jami terinspirasi oleh kata Swahili 'jamii', yang berarti 'komunitas' sebagai kata benda dan 'bersama' sebagai kata keterangan.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Cadangkan akun</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Titik merah berarti bahwa akun Anda terputus dari jaringan; titik ini berubah menjadi hijau ketika sudah terhubung.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Mengapa saya harus mencadangkan akun saya?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami didistribusikan dan akun Anda hanya disimpan secara lokal di perangkat Anda. Jika Anda kehilangan kata sandi atau data akun lokal Anda, Anda TIDAK AKAN dapat memulihkan akun Anda jika Anda tidak mencadangkannya sebelumnya.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Dapatkah saya melakukan panggilan konferensi?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Apakah jami memiliki obrolan grup?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dalam pengaturan, Anda dapat mengaktifkan dukungan untuk grup (eksperimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Apa yang dimaksud dengan akun Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Akun Jami adalah kunci enkripsi asimetris. Akun Anda diidentifikasi oleh Jami ID, yang merupakan sidik jari dari kunci publik Anda.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Informasi apa yang perlu saya berikan untuk membuat akun Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Saat Anda membuat akun Jami baru, Anda tidak perlu memberikan informasi pribadi apa pun seperti email, alamat, atau nomor telepon.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Dengan Jami, akun Anda disimpan dalam direktori pada perangkat Anda. Kata sandi hanya digunakan untuk mengenkripsi akun Anda untuk melindungi Anda dari seseorang yang memiliki akses fisik ke perangkat Anda.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Akun Anda hanya tersimpan di perangkat Anda sendiri. Jika Anda menghapus akun Anda dari semua perangkat Anda, akun tersebut akan hilang selamanya dan Anda TIDAK BISA memulihkannya.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Dapatkah saya menggunakan akun saya pada beberapa perangkat?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Ya, Anda bisa menautkan akun Anda dari pengaturan, atau Anda bisa mengimpor cadangan Anda pada perangkat lain.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>Mengapa saya tidak harus menggunakan kata sandi?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Dalam panggilan, Anda bisa mengklik "Tambah partisipan" untuk menambahkan kontak ke panggilan.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>Mengapa saya tidak harus mendaftarkan nama pengguna?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>Pengidentifikasi yang paling permanen dan aman adalah Jami ID Anda, tetapi karena ini sulit digunakan bagi sebagian orang, Anda juga memiliki opsi untuk mendaftarkan nama pengguna.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Bagaimana saya mencadangkan akun saya?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Dalam Pengaturan akun, tersedia tombol untuk membuat cadangan akun Anda.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Apa yang terjadi bila saya menghapus akun saya?</translation>
</message>
diff --git a/translations/ring_client_windows_ig.ts b/translations/ring_client_windows_ig.ts
index bac31eddb..ceb932272 100644
--- a/translations/ring_client_windows_ig.ts
+++ b/translations/ring_client_windows_ig.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts
index 2671870a9..cfa62364e 100644
--- a/translations/ring_client_windows_it.ts
+++ b/translations/ring_client_windows_it.ts
@@ -12,7 +12,7 @@
<translation>Chiamata persa da %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>io</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nuovo messaggio</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Richiesta fidata</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privato</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Gruppo privato (inviti limitati)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Gruppo privato</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Gruppo pubblico</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Si è verificato un errore durante il recupero di questo repository</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>La modalità della conversazione non è riconosciuta</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>È stato rilevato un messaggio non valido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Non ci sono abbastanza autorizzazioni per aggiornare le informazioni sulla conversazione</translation>
</message>
@@ -3198,32 +3198,17 @@ Copia e condividi con i tuoi amici!</translation>
<translation>Completato</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 giorni fa</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Oggi</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>un giorno fa</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ieri</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 ore fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>un'ora fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minuti fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>ora</translation>
</message>
@@ -3700,132 +3685,132 @@ Copia e condividi con i tuoi amici!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizza</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Cosa significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fai il backup dell'account</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rosso significa che l'account è disconnesso dalla rete; mentre diventa verde quando è connesso.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Perché dovrei fare il backup del mio account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami è distribuito e il tuo account è memorizzato solo localmente sul tuo dispositivo. Se si perde la password o i dati locali dell'account, NON sarà possibile recuperare l'account se non si è eseguito il backup in precedenza.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Posso fare una teleconferenza?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Jami ha chat di gruppo?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Che cos'è un conto Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Quando si crea un nuovo account Jami, non è necessario fornire informazioni private come e-mail, indirizzo o numero di telefono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>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 tuo dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Il tuo account è memorizzato solo sui tuoi dispositivi. Se si elimina l'account da tutti i tuoi dispositivi, l'account è perso per sempre e NON può essere recuperato.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Posso utilizzare il mio account su più dispositivi?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sì, è possibile collegare il proprio account dalle impostazioni, oppure importare il backup su un altro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Nelle impostazioni dell'account è disponibile un pulsante per eseguire il backup dell'account.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Cosa succede quando elimino il mio account?</translation>
</message>
diff --git a/translations/ring_client_windows_it_IT.ts b/translations/ring_client_windows_it_IT.ts
index 99074ab4e..0550b9c7f 100644
--- a/translations/ring_client_windows_it_IT.ts
+++ b/translations/ring_client_windows_it_IT.ts
@@ -12,7 +12,7 @@
<translation>Chiamata persa da %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>io</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nuovo messaggio</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Richiesta fidata</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privato</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Gruppo privato (inviti limitati)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Gruppo privato</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Gruppo pubblico</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Si è verificato un errore durante il recupero di questo repository</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>La modalità della conversazione non è riconosciuta</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>È stato rilevato un messaggio non valido</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Non ci sono abbastanza autorizzazioni per aggiornare le informazioni sulla conversazione</translation>
</message>
@@ -3198,32 +3198,17 @@ Copia e condividi con i tuoi amici!</translation>
<translation>Finito</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 giorni fa</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Oggi</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>un giorno fa</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ieri</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 ore fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>un'ora fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minuti fa</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>ora</translation>
</message>
@@ -3700,132 +3685,132 @@ Copia e condividi con i tuoi amici!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizza</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Cosa significa Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fai il backup dell'account</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Un punto rosso significa che l'account è disconnesso dalla rete; mentre diventa verde quando è connesso.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Perché dovrei fare il backup del mio account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami è distribuito e il tuo account è memorizzato solo localmente sul tuo dispositivo. Se si perde la password o i dati locali dell'account, NON sarà possibile recuperare l'account se non si è eseguito il backup in precedenza.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Posso fare una teleconferenza?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Jami ha chat di gruppo?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Che cos'è un conto Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Quando si crea un nuovo account Jami, non è necessario fornire informazioni private come e-mail, indirizzo o numero di telefono.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>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 tuo dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Il tuo account è memorizzato solo sui tuoi dispositivi. Se si elimina l'account da tutti i tuoi dispositivi, l'account è perso per sempre e NON può essere recuperato.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Posso utilizzare il mio account su più dispositivi?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Sì, è possibile collegare il proprio account dalle impostazioni, oppure importare il backup su un altro dispositivo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Nelle impostazioni dell'account è disponibile un pulsante per eseguire il backup dell'account.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Cosa succede quando elimino il mio account?</translation>
</message>
diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts
index 28b89efb7..44e6ed0ea 100644
--- a/translations/ring_client_windows_ja.ts
+++ b/translations/ring_client_windows_ja.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>自分</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>新規メッセージ</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>要求を信頼</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3188,32 +3188,17 @@ Copy and share it with your friends!</source>
<translation>通話終了</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>1 日前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>今日</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>1 時間前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>昨日</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>ちょうど今</translation>
</message>
@@ -3690,132 +3675,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>アカウントをバックアップ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_kk.ts b/translations/ring_client_windows_kk.ts
index a192cae8c..4f1066800 100644
--- a/translations/ring_client_windows_kk.ts
+++ b/translations/ring_client_windows_kk.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_kn.ts b/translations/ring_client_windows_kn.ts
index 3b1cd63f1..9163b7887 100644
--- a/translations/ring_client_windows_kn.ts
+++ b/translations/ring_client_windows_kn.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ko.ts b/translations/ring_client_windows_ko.ts
index cee61d844..13c86d2fe 100644
--- a/translations/ring_client_windows_ko.ts
+++ b/translations/ring_client_windows_ko.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ko_KR.ts b/translations/ring_client_windows_ko_KR.ts
index 73ed7880e..7c32c9141 100644
--- a/translations/ring_client_windows_ko_KR.ts
+++ b/translations/ring_client_windows_ko_KR.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index cbd655f73..c2c8f00c6 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nauja žinutė</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3187,32 +3187,17 @@ Nukopijuokite ir dalinkitės juo su draugais!</translation>
<translation>Užbaigta</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>prieš vieną dieną</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Šiandien</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>prieš vieną valandą</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Vakar</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>ką tik</translation>
</message>
@@ -3689,132 +3674,132 @@ Nukopijuokite ir dalinkitės juo su draugais!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Padaryti paskyros atsarginę kopiją</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ml.ts b/translations/ring_client_windows_ml.ts
index 3545d90a8..8182817a1 100644
--- a/translations/ring_client_windows_ml.ts
+++ b/translations/ring_client_windows_ml.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_mn_MN.ts b/translations/ring_client_windows_mn_MN.ts
index b01feee27..8f68ff531 100644
--- a/translations/ring_client_windows_mn_MN.ts
+++ b/translations/ring_client_windows_mn_MN.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_mr.ts b/translations/ring_client_windows_mr.ts
index 383a9edb1..12818fee3 100644
--- a/translations/ring_client_windows_mr.ts
+++ b/translations/ring_client_windows_mr.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts
index c20b0815f..0375b9869 100644
--- a/translations/ring_client_windows_ms.ts
+++ b/translations/ring_client_windows_ms.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hari ini</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Semalam</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts
index 699030c02..9f1cc5305 100644
--- a/translations/ring_client_windows_nb.ts
+++ b/translations/ring_client_windows_nb.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>meg</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Ny melding</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Stol på henvendelse</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3193,32 +3193,17 @@ Kopier og del det med dine venner!</translation>
<translation>Fullført</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 dager siden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>i går</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 timer siden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>en time siden</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minutter siden</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Igår</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>akkurat nå</translation>
</message>
@@ -3695,132 +3680,132 @@ Kopier og del det med dine venner!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Sikkerhetskopier konto</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nb_NO.ts b/translations/ring_client_windows_nb_NO.ts
index 064080382..0ecd317e1 100644
--- a/translations/ring_client_windows_nb_NO.ts
+++ b/translations/ring_client_windows_nb_NO.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -58,42 +58,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3188,32 +3188,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3690,132 +3675,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_ne.ts b/translations/ring_client_windows_ne.ts
index 045469bb8..f96fca489 100644
--- a/translations/ring_client_windows_ne.ts
+++ b/translations/ring_client_windows_ne.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts
index 95993fe93..a1be486e1 100644
--- a/translations/ring_client_windows_nl.ts
+++ b/translations/ring_client_windows_nl.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nieuw bericht</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Vertrouwensverzoek</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3187,32 +3187,17 @@ Deel deze met uw vrienden!</translation>
<translation>Beëindigd</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>een dag geleden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Vandaag</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>een uur geleden</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Gisteren</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>zonet</translation>
</message>
@@ -3689,132 +3674,132 @@ Deel deze met uw vrienden!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Reservekopie van account maken</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nl_BE.ts b/translations/ring_client_windows_nl_BE.ts
index 70d9240e9..c0132833e 100644
--- a/translations/ring_client_windows_nl_BE.ts
+++ b/translations/ring_client_windows_nl_BE.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nieuw bericht</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Vertrouwensverzoek</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3187,32 +3187,17 @@ Deel hem met uw vrienden!</translation>
<translation>Beëindigd</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>een dag geleden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Vandaag</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>een uur geleden</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Gisteren</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Nu net</translation>
</message>
@@ -3689,132 +3674,132 @@ Deel hem met uw vrienden!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Back-up maken van account</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nl_NL.ts b/translations/ring_client_windows_nl_NL.ts
index 66634807c..aa6ed4705 100644
--- a/translations/ring_client_windows_nl_NL.ts
+++ b/translations/ring_client_windows_nl_NL.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nieuw bericht</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Vertrouwensverzoek</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3187,32 +3187,17 @@ Deel hem met uw vrienden!</translation>
<translation>Beëindigd</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>een dag geleden</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Vandaag</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>een uur geleden</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Gisteren</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Nu net</translation>
</message>
@@ -3689,132 +3674,132 @@ Deel hem met uw vrienden!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Reservekopie van account maken</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nn.ts b/translations/ring_client_windows_nn.ts
index be92a9bac..ab1b2dd21 100644
--- a/translations/ring_client_windows_nn.ts
+++ b/translations/ring_client_windows_nn.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_oc.ts b/translations/ring_client_windows_oc.ts
index 6c419d441..750b122b5 100644
--- a/translations/ring_client_windows_oc.ts
+++ b/translations/ring_client_windows_oc.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nòu messatge</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3187,32 +3187,17 @@ Copiatz-lo e partejatz-lo a vòstres amics !</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ièr</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Ara meteis</translation>
</message>
@@ -3689,132 +3674,132 @@ Copiatz-lo e partejatz-lo a vòstres amics !</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts
index 4d7ee7ed3..995f4fae8 100644
--- a/translations/ring_client_windows_pa.ts
+++ b/translations/ring_client_windows_pa.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>ਅੱਜ</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>ਕੱਲ੍ਹ</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>ਬੈਕਅੱਪ ਖਾਤਾ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts
index 1facb1cbe..d45c6bb5f 100644
--- a/translations/ring_client_windows_pl.ts
+++ b/translations/ring_client_windows_pl.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>ja</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nowa wiadomość</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Rządanie zaufania</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3189,32 +3189,17 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<translation>Zakończono</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>jeden dzień temu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Dzisiaj</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>jedną godzinę temu</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Wczoraj</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>teraz</translation>
</message>
@@ -3691,132 +3676,132 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Wykonaj kopię zapasową</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pl_PL.ts b/translations/ring_client_windows_pl_PL.ts
index a80b3001b..897c82f50 100644
--- a/translations/ring_client_windows_pl_PL.ts
+++ b/translations/ring_client_windows_pl_PL.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>ja</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nowa wiadomość</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Rządanie zaufania</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3189,32 +3189,17 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<translation>Zakończono</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>jeden dzień temu</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Dzisiaj</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>jedną godzinę temu</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Wczoraj</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>teraz</translation>
</message>
@@ -3691,132 +3676,132 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Wykonaj kopię zapasową</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts
index 6a76af598..b6f028799 100644
--- a/translations/ring_client_windows_pt.ts
+++ b/translations/ring_client_windows_pt.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nova mensagem</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Confiar no pedido</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3193,32 +3193,17 @@ Copie e o partilhe-o com os seus amigos!</translation>
<translation>Terminado</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 dias atrás</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoje</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>há um dia</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ontem</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 horas atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>há uma hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minutos atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>agora mesmo</translation>
</message>
@@ -3695,132 +3680,132 @@ Copie e o partilhe-o com os seus amigos!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Conta de cópia de segurança</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pt_BR.ts b/translations/ring_client_windows_pt_BR.ts
index 14a4bd100..aa95a2f76 100644
--- a/translations/ring_client_windows_pt_BR.ts
+++ b/translations/ring_client_windows_pt_BR.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nova mensagem</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Confiar na requisição</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3193,32 +3193,17 @@ Copie-o e compartilhe com seus amigos!</translation>
<translation>Terminado</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 dias atrás</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoje</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>um dia atrás</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ontem</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 horas atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>uma hora atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minutos atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Agora</translation>
</message>
@@ -3695,132 +3680,132 @@ Copie-o e compartilhe com seus amigos!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Cópia de segurança da conta</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pt_PT.ts b/translations/ring_client_windows_pt_PT.ts
index a3602db38..e9cf8326b 100644
--- a/translations/ring_client_windows_pt_PT.ts
+++ b/translations/ring_client_windows_pt_PT.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nova mensagem</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Confiar no pedido</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3193,32 +3193,17 @@ Copie e o partilhe-o com os seus amigos!</translation>
<translation>Terminado</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 dias atrás</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Hoje</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>há um dia</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ontem</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 horas atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>há uma hora</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minutos atrás</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>agora mesmo</translation>
</message>
@@ -3695,132 +3680,132 @@ Copie e o partilhe-o com os seus amigos!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Conta de cópia de segurança</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts
index ed3c951a4..505183f55 100644
--- a/translations/ring_client_windows_ro.ts
+++ b/translations/ring_client_windows_ro.ts
@@ -12,7 +12,7 @@
<translation>Apel pierdut de la %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Mesaj nou</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Cerere de încredere</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grup privat (invitații limitate)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grup privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grup public</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>A apărut o eroare la obținerea acestui depozit</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Tipul conversației nu e recunoscut.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>A fost detectat un mesaj greșit</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Autorizații insuficiente pentru actualizarea informațiilor despre conversație</translation>
</message>
@@ -3197,32 +3197,17 @@ Copiază-l și distribuie-l prietenilor!</translation>
<translation>Terminat</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>acum %1 zile</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>acum o zi</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>acum %1 ore</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>acum o oră</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>acum %1 minute</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ieri</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>chiar acum</translation>
</message>
@@ -3699,132 +3684,132 @@ Copiază-l și distribuie-l prietenilor!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizează</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Ce înseamnă Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fă o copie de rezervă</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>De ce ar trebui să fac o copie de rezervă a contului meu?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami este distribuit, iar contul tău este stocat doar la nivel local în aparatul tău. Dacă pierzi parola sau datele locale ale contului, NU vei putea să îți recuperezi contul dacă nu ai făcut înainte o copie de rezervă.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Pot face o teleconferință?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Are Jami discuții în grup?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Ce este un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Contul tău este stocat doar în aparatele tale. Dacă-ți ștergi contul din toate aparatele, contul dispare și NU îl mai poți recupera.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Pot să-mi folosesc contul pe mai multe aparate?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>În reglările contului, este disponibil un buton pentru a face o copie de rezervă a contului.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Ce se întîmplă dacă îmi șterg contul?</translation>
</message>
diff --git a/translations/ring_client_windows_ro_RO.ts b/translations/ring_client_windows_ro_RO.ts
index fa33703b2..61e21c5c9 100644
--- a/translations/ring_client_windows_ro_RO.ts
+++ b/translations/ring_client_windows_ro_RO.ts
@@ -12,7 +12,7 @@
<translation>Apel pierdut de la %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>eu</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Mesaj nou</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Cerere de încredere</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grup privat (invitații limitate)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grup privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grup public</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>A apărut o eroare la obținerea acestui depozit</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Tipul conversației nu e recunoscut.</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>A fost detectat un mesaj greșit</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Autorizații insuficiente pentru actualizarea informațiilor despre conversație</translation>
</message>
@@ -3197,32 +3197,17 @@ Copiază-l și distribuie-l prietenilor!</translation>
<translation>Terminat</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>acum %1 zile</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>acum o zi</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>acum %1 ore</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>acum o oră</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>acum %1 minute</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Ieri</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>chiar acum</translation>
</message>
@@ -3699,132 +3684,132 @@ Copiază-l și distribuie-l prietenilor!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Personalizează</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Ce înseamnă Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Fă o copie de rezervă</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>De ce ar trebui să fac o copie de rezervă a contului meu?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami este distribuit, iar contul tău este stocat doar la nivel local în aparatul tău. Dacă pierzi parola sau datele locale ale contului, NU vei putea să îți recuperezi contul dacă nu ai făcut înainte o copie de rezervă.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>Pot face o teleconferință?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Are Jami discuții în grup?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Ce este un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Contul tău este stocat doar în aparatele tale. Dacă-ți ștergi contul din toate aparatele, contul dispare și NU îl mai poți recupera.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Pot să-mi folosesc contul pe mai multe aparate?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup 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>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>În reglările contului, este disponibil un buton pentru a face o copie de rezervă a contului.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Ce se întâmplă dacă îmi șterg contul?</translation>
</message>
diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index a427bae60..9872fa8fe 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>мне</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Новое сообщение</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Запрос доверия</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3192,32 +3192,17 @@ Copy and share it with your friends!</source>
<translation>Завершён</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 дней назад</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Сегодня</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>один день назад</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Вчера</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 часов назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>один час назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 минут назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>прямо сейчас</translation>
</message>
@@ -3694,132 +3679,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>Что означает зелёная точка рядом с моим аккаунтом?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Создать резервную копию аккаунта</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Что такое аккаунт Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Аккаунт Jami — это асимметричный ключ шифрования. Ваш аккаунт идентифицируется Jami ID, который является отпечатком вашего открытого ключа.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Какую информацию мне нужно предоставить для создания аккаунта Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Как мне создать резервную копию своего аккаунта?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>В настройках аккаунта доступна кнопка для создания резервной копии вашего аккаунта.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Что происходит, когда я удаляю свой аккаунт?</translation>
</message>
diff --git a/translations/ring_client_windows_ru_RU.ts b/translations/ring_client_windows_ru_RU.ts
index 31fe5e841..becab1de2 100644
--- a/translations/ring_client_windows_ru_RU.ts
+++ b/translations/ring_client_windows_ru_RU.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>я</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Новое сообщение</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Запрос доверия</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3192,32 +3192,17 @@ Copy and share it with your friends!</source>
<translation>Завершено</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 дней назад</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Сегодня</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>вчера</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Вчера</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 часов назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>час назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 минут назад</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>только что</translation>
</message>
@@ -3694,132 +3679,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>Что означает зелёная точка рядом с моим аккаунтом?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Резервная копия аккаунта</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Что такое аккаунт Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Аккаунт Jami — это асимметричный ключ шифрования. Ваш аккаунт идентифицируется Jami ID, который является отпечатком вашего открытого ключа.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Какую информацию мне нужно предоставить для создания аккаунта Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Как мне создать резервную копию своего аккаунта?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>В настройках аккаунта доступна кнопка для создания резервной копии вашего аккаунта.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Что происходит, когда я удаляю свой аккаунт?</translation>
</message>
diff --git a/translations/ring_client_windows_si.ts b/translations/ring_client_windows_si.ts
index 74bac07fa..ab258adce 100644
--- a/translations/ring_client_windows_si.ts
+++ b/translations/ring_client_windows_si.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sk.ts b/translations/ring_client_windows_sk.ts
index 70183a6b4..a61f04b5d 100644
--- a/translations/ring_client_windows_sk.ts
+++ b/translations/ring_client_windows_sk.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nová správa</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Veriť žiadosti</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3187,32 +3187,17 @@ Skopírujte ho a zdieľajte s priateľmi!</translation>
<translation>Ukončený</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Dnes</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation>Včera</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>Pred hodinou</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Práve teraz</translation>
</message>
@@ -3689,132 +3674,132 @@ Skopírujte ho a zdieľajte s priateľmi!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Zálohovať účet</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts
index 93dc6eb4a..178744c4f 100644
--- a/translations/ring_client_windows_sk_SK.ts
+++ b/translations/ring_client_windows_sk_SK.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nová správa</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Veriť žiadosti</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3187,32 +3187,17 @@ Skopírujte ho a zdieľajte s priateľmi!</translation>
<translation>Ukončený</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Dnes</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation>Včera</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>Pred hodinou</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Práve teraz</translation>
</message>
@@ -3689,132 +3674,132 @@ Skopírujte ho a zdieľajte s priateľmi!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Zálohovať účet</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sl.ts b/translations/ring_client_windows_sl.ts
index 79177e8ce..c8e6303be 100644
--- a/translations/ring_client_windows_sl.ts
+++ b/translations/ring_client_windows_sl.ts
@@ -12,7 +12,7 @@
<translation>Zgrešen klic: %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>jaz</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Novo sporočilo</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Zaupaj zahtevku</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Zasebno</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Zasebna skupina (omejena povabila)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Zasebna skupina</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Javna skupina</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Pri pridobivanju tega skladišča je prišlo do napake</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Način pogovora ni prepoznan</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>Zaznano je neveljavno sporočilo</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Nezadostna overitev za posodobitev podatkov pogovora</translation>
</message>
@@ -3198,32 +3198,17 @@ Kopirajte ga in delite s prijatelji!</translation>
<translation>Končano</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>Pred %1 dnevi</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Danes</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>pred enim dnevom</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Včeraj</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>Pred %1 urami</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>pred eno uro</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>Pred %1 minutami</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>ravnokar</translation>
</message>
@@ -3700,132 +3685,132 @@ Kopirajte ga in delite s prijatelji!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Prilagodi</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Kaj pomeni Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<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="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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>Ime 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Varnostno kopiranje računa</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Rdeča pika pomeni, da vaš račun ni povezan v omrežje; spremeni se v zeleno, ko je povezan.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Zakaj bi bilo dobro, da varnostno kopiram svoj račun?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami je porazdeljen in vaš račun je shranjen samo krajevno na vaši napravi. Če izgubite geslo ali podatke vašega krajevnega računa, NE BOSTE mogli obnoviti svojega računa, če ga poprej niste varnostno kopirali.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<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="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>Ali ima Jami skupinske klepete?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Kaj je račun Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Ko ustvarite nov račun Jami, ne rabite podati nobenih zasebnih podatkov, kot so e-naslov, naslov ali telefonska številka.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Z Jamijem je vaš račun shranjen v mapi na vaši napravi. Geslo se uporabi samo za šifriranje vašega računa, da vas zaščiti pred nekom, ki ima fizični dostop do vaše naprave.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Vaš račun se hrani le na vaših lastnih napravah. Če izbrišete račun iz vseh svojih naprav, je račun za vekomaj izginil in ga NE morete obnoviti.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>Ali lahko uporabljam svoj račun na več napravah?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Da, svoj račun lahko povežete prek nastavitev ali uvozite svojo varnostno kopijo na drugo napravo.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<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="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<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="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<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="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>V Nastavitvah računa je na voljo gumb, s pritiskom katerega varnostno kopirate svoj račun.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Kaj se zgodi, če izbrišem svoj račun?</translation>
</message>
diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts
index ca0f3ac90..8c65aae56 100644
--- a/translations/ring_client_windows_sq_AL.ts
+++ b/translations/ring_client_windows_sq_AL.ts
@@ -12,7 +12,7 @@
<translation>Thirrje e humbur me %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>unë</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Mesazh i ri</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Kërkesë besueshmërie</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation>Privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation>Grup privat (kufizim ftesash)</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>Grup privat</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>Grup publik</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation>Ndodhi një gabim, kur sillej kjo depo</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>Mënyra e bisedës është e panjohur</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>U pikas një mesazh i pavlefshëm</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation>Pa autorizim të mjaftueshëm për përditësim hollësish bisede</translation>
</message>
@@ -3198,32 +3198,17 @@ Kopjojeni dhe jepuani shokëve!</translation>
<translation>Përfundoi</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 ditë më parë</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Sot</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>një ditë më parë</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Dje</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 orë më parë</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>një orë më parë</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minuta më parë</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>mu tani</translation>
</message>
@@ -3700,132 +3685,132 @@ Kopjojeni dhe jepuani shokëve!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>Përshtateni</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Ç’do të thotë Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation>Ç’nënkupton pika e gjelbër në krah të llogarisë time?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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>Zgjedhja e emrit Jami u frymëzua nga fjala “jamii” e suahilishtes, që, si emër, do të thotë “bashkësi” dhe si ndajfolje do të thotë “tok”.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Kopjeruaje llogarinë</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation>Një topth i kuq do të thotë se llogaria juaj është shkëputur nga rrjeti; bëhet i gjelbër, kur ajo lidhet.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Pse duhet ta kopjeruaj llogarinë time?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami është platformë e shpërndarë dhe llogaria juaj depozitohet lokalisht vetëm në pajisjen tuaj. Nëse humbni fjalëkalimin tuaj, ose të dhënat vendore të llogarisë tuaj, NUK do të jeni në gjendje të ringjallni llogarinë tuaj, nëse nuk e keni kopjeruajtur më herët.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation>A mund të bëj thirrje konferencë?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation>A ka fjalosje në grup Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Te rregullimet, mund të aktivizoni mbulim për grupe (eksperimentale)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation>Ç’është një llogari Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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>Një llogari Jami është një kyç asimetrik fshehtëzimi. Llogaria juaj identifikohet nga një ID Jami që është shenjë gishti e kyçit tuaj publik.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Ç’hollësi duhet të jap për të krijuar një llogari Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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>Kur krijoni një llogari të re Jami, nuk ju duhet të jepni ndonjë hollësi private, bie fjala, një email, adresë, apo numër telefoni.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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>Me Jami-n, llogaria juaj depozitohet në një drejtori në pajisjen tuaj. Fjalëkalimi përdoret vetëm për të fshehtëzuar llogarinë tuaj, me qëllim mbrojtjen tuaj nga dikush që ka shtënë në dorë pajisjen tuaj.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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>Llogaria juaj depozitohet lokalisht vetëm në pajisjen tuaj. Nëse fshini llogarinë tuaj nga krejt pajisjet tuaja, llogaria ikën përgjithmonë dhe NUK mund ta ringjallni.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation>A mund ta përdor llogarinë time në pajisje të shumta?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation>Po, mund ta lidhni llogarinë tuaj që nga rregullimet, ose mund të importoni kopjeruajtjen tuaj në një pajisje tjetër.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation>Pse s’më duhet të përdor një fjalëkalim?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<source>In a call, you can click on "Add participants" to add a contact to a call.</source>
<translation>Gjatë një thirrjeje, mund të klikoni mbi “Shtoni pjesëmarrës”, që të shtoni një kontakt te thirrja.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation>Pse më duhet të regjistroj një emër përdoruesi?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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>Identifikuesi më i qëndrueshëm, më i sigurt është ID-ja juaj Jami, por ngaqë këto janë të vështira për t’u përdorur nga disa persona, keni gjithashtu mundësinë e regjistrimit të një emri përdoruesi.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Si mund ta kopjeruaj llogarinë time?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>Te Rregullime Llogarie ka një buton për të krijuar një kopjeruajtje të llogarisë tuaj.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>Ç’ndodh nëse fshij llogariën time?</translation>
</message>
diff --git a/translations/ring_client_windows_sr.ts b/translations/ring_client_windows_sr.ts
index a9b1ee9fd..590801e90 100644
--- a/translations/ring_client_windows_sr.ts
+++ b/translations/ring_client_windows_sr.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sr@Cyrl.ts b/translations/ring_client_windows_sr@Cyrl.ts
index cc89c44bc..88f71690f 100644
--- a/translations/ring_client_windows_sr@Cyrl.ts
+++ b/translations/ring_client_windows_sr@Cyrl.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sr_RS.ts b/translations/ring_client_windows_sr_RS.ts
index ce9d23552..233a5e05e 100644
--- a/translations/ring_client_windows_sr_RS.ts
+++ b/translations/ring_client_windows_sr_RS.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -58,42 +58,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3188,32 +3188,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3690,132 +3675,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts
index 52f377f5d..2e5913119 100644
--- a/translations/ring_client_windows_sv.ts
+++ b/translations/ring_client_windows_sv.ts
@@ -12,7 +12,7 @@
<translation>Missat samtal med %1</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>jag</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Nytt meddelande</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Lita på begäran</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3191,32 +3191,17 @@ Kopiera och dela det med dina vänner!</translation>
<translation>Slutförd</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 dagar sedan</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>I dag</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>en dag sedan</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>I går</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 timmar sedan</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>en timma sedan</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 minuter sedan</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>just nu</translation>
</message>
@@ -3693,132 +3678,132 @@ Kopiera och dela det med dina vänner!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Säkerhetskopiera konto</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sw.ts b/translations/ring_client_windows_sw.ts
index fe5ccd1ff..f743d94ae 100644
--- a/translations/ring_client_windows_sw.ts
+++ b/translations/ring_client_windows_sw.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ta.ts b/translations/ring_client_windows_ta.ts
index f1c8e3f86..a9bdf8223 100644
--- a/translations/ring_client_windows_ta.ts
+++ b/translations/ring_client_windows_ta.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_te.ts b/translations/ring_client_windows_te.ts
index 5d5b4d466..791d71f32 100644
--- a/translations/ring_client_windows_te.ts
+++ b/translations/ring_client_windows_te.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_th.ts b/translations/ring_client_windows_th.ts
index e93f7fad8..97ed1ce52 100644
--- a/translations/ring_client_windows_th.ts
+++ b/translations/ring_client_windows_th.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts
index ebccb6921..dd6adbfb4 100644
--- a/translations/ring_client_windows_tr.ts
+++ b/translations/ring_client_windows_tr.ts
@@ -12,7 +12,7 @@
<translation>%1 ile cevapsız arama</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>ben</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Yeni ileti</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Güven isteği</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3193,32 +3193,17 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
<translation>Bitti</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 gün önce</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Bugün</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>bir gün önce</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Dün</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 saat önce</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>bir saat önce</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 dakika önce</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>Şu an</translation>
</message>
@@ -3695,132 +3680,132 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Hesabı yedekle</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_tr_TR.ts b/translations/ring_client_windows_tr_TR.ts
index c79e16dde..a4b8b2f27 100644
--- a/translations/ring_client_windows_tr_TR.ts
+++ b/translations/ring_client_windows_tr_TR.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -58,42 +58,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3188,32 +3188,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3690,132 +3675,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_tt.ts b/translations/ring_client_windows_tt.ts
index 36c8b851f..b22078ee0 100644
--- a/translations/ring_client_windows_tt.ts
+++ b/translations/ring_client_windows_tt.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index 61504166f..1b60bf1f3 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>мені</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>Нове повідомлення</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>Запит довіри</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3187,32 +3187,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>один день тому</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>Сьогодні</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>одну годину тому</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>Вчора</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>щойно</translation>
</message>
@@ -3689,132 +3674,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>Резервна копія облікового запису</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>Чому мені потрібно створити резервну копію свого облікового запису?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>Як я можу створити резервну копію свого облікового запису?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_uk_UA.ts b/translations/ring_client_windows_uk_UA.ts
index 5acc789ea..4f089b85f 100644
--- a/translations/ring_client_windows_uk_UA.ts
+++ b/translations/ring_client_windows_uk_UA.ts
@@ -14,7 +14,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
@@ -37,12 +37,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"></translation>
</message>
@@ -58,42 +58,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"></translation>
</message>
@@ -3188,32 +3188,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"></translation>
</message>
@@ -3690,132 +3675,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<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="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_vi.ts b/translations/ring_client_windows_vi.ts
index 86373e383..d29d95039 100644
--- a/translations/ring_client_windows_vi.ts
+++ b/translations/ring_client_windows_vi.ts
@@ -12,7 +12,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation type="unfinished"/>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation type="unfinished"/>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3186,32 +3186,17 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation type="unfinished"/>
</message>
@@ -3688,132 +3673,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In 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="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts
index eb2e807e3..05fa38498 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -12,7 +12,7 @@
<translation>來自 %1 的未接來電</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>我</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>新消息</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>信任請求</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>私密组</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>公开组<br></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>会话模式未识别</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>检测到无效的消息</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3193,32 +3193,17 @@ Copy and share it with your friends!</source>
<translation>已結束</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>今天</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>一天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>昨天</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>一小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 分钟前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>刚才</translation>
</message>
@@ -3695,132 +3680,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>自定义</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Jami 有何含义？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>备份账户</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>为什么应该备份账户？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami是分布式，你的账号仅保存在本地设备里。如果你忘记密码或丢失本地账号数据，也没有提前备份的话，你将无法恢复你的账号。</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>怎样备份账户?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>在账户设置里，创建备份账户的按钮可用</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>删除自己的账号会发生什么?</translation>
</message>
diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts
index d17cef4b2..ba2fcc80d 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -12,7 +12,7 @@
<translation>來自 %1 的未接來電</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>我</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>新消息</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>信任请求</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>私密组</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>公开组</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>会话模式未识别</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>检测到无效的消息</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3193,32 +3193,17 @@ Copy and share it with your friends!</source>
<translation>完成</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>今天</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>一天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>昨天</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>一小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 分钟前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>刚才</translation>
</message>
@@ -3695,132 +3680,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>自定义</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Jami 有何含义？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>备份账户</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>为什么应该备份账户？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami是分布式，你的账号仅保存在本地设备里。如果你忘记密码或丢失本地账号数据，也没有提前备份的话，你将无法恢复你的账号。</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>怎样备份账户?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>在账户设置里，有一个按钮可以创建账户的备份</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>删除自己的账号会发生什么?</translation>
</message>
diff --git a/translations/ring_client_windows_zh_HK.ts b/translations/ring_client_windows_zh_HK.ts
index ab13696aa..4cddab71e 100644
--- a/translations/ring_client_windows_zh_HK.ts
+++ b/translations/ring_client_windows_zh_HK.ts
@@ -12,7 +12,7 @@
<translation>來自 %1 的未接來電</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>我</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>新消息</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>信任請求</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>私密组</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>公开组<br></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>会话模式未识别</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>检测到无效的消息</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3193,32 +3193,17 @@ Copy and share it with your friends!</source>
<translation>已結束</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>今天</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>一天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>昨天</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>一小时前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 分钟前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>刚才</translation>
</message>
@@ -3695,132 +3680,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>自定义</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Jami 有何含义？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>备份账户</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>为什么应该备份账户？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami是分布式，你的账号仅保存在本地设备里。如果你忘记密码或丢失本地账号数据，也没有提前备份的话，你将无法恢复你的账号。</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>怎样备份账户?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>在账户设置里，创建备份账户的按钮可用</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>删除自己的账号会发生什么?</translation>
</message>
diff --git a/translations/ring_client_windows_zh_TW.ts b/translations/ring_client_windows_zh_TW.ts
index 9bc018e3c..df896516b 100644
--- a/translations/ring_client_windows_zh_TW.ts
+++ b/translations/ring_client_windows_zh_TW.ts
@@ -12,7 +12,7 @@
<translation>來自 %1 的未接來電</translation>
</message>
<message>
- <location filename="../src/app/calladapter.cpp" line="536"/>
+ <location filename="../src/app/calladapter.cpp" line="531"/>
<source>me</source>
<translation>我</translation>
</message>
@@ -35,12 +35,12 @@
<context>
<name>ConversationsAdapter</name>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="178"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="183"/>
<source>New message</source>
<translation>新訊息</translation>
</message>
<message>
- <location filename="../src/app/conversationsadapter.cpp" line="232"/>
+ <location filename="../src/app/conversationsadapter.cpp" line="242"/>
<source>Trust request</source>
<translation>信任請求</translation>
</message>
@@ -56,42 +56,42 @@
<context>
<name>CurrentConversation</name>
<message>
- <location filename="../src/app/currentconversation.cpp" line="95"/>
+ <location filename="../src/app/currentconversation.cpp" line="98"/>
<source>Private</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="97"/>
+ <location filename="../src/app/currentconversation.cpp" line="100"/>
<source>Private group (restricted invites)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="99"/>
+ <location filename="../src/app/currentconversation.cpp" line="102"/>
<source>Private group</source>
<translation>私密组</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="101"/>
+ <location filename="../src/app/currentconversation.cpp" line="104"/>
<source>Public group</source>
<translation>公开组<br></translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="172"/>
+ <location filename="../src/app/currentconversation.cpp" line="228"/>
<source>An error occurred while fetching this repository</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="174"/>
+ <location filename="../src/app/currentconversation.cpp" line="230"/>
<source>The conversation's mode is un-recognized</source>
<translation>会话模式未识别</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="176"/>
+ <location filename="../src/app/currentconversation.cpp" line="232"/>
<source>An invalid message was detected</source>
<translation>检测到无效的消息</translation>
</message>
<message>
- <location filename="../src/app/currentconversation.cpp" line="179"/>
+ <location filename="../src/app/currentconversation.cpp" line="235"/>
<source>Not enough authorization for updating conversation's infos</source>
<translation type="unfinished"/>
</message>
@@ -3193,32 +3193,17 @@ Copy and share it with your friends!</source>
<translation>已結束</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="589"/>
- <source>%1 days ago</source>
- <translation>%1 天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="607"/>
+ <source>Today</source>
+ <translation>今天</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="591"/>
- <source>one day ago</source>
- <translation>1 天前</translation>
+ <location filename="../src/app/messagesadapter.cpp" line="609"/>
+ <source>Yesterday</source>
+ <translation>昨天</translation>
</message>
<message>
- <location filename="../src/app/messagesadapter.cpp" line="594"/>
- <source>%1 hours ago</source>
- <translation>%1 小時前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="596"/>
- <source>one hour ago</source>
- <translation>1 小時前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="599"/>
- <source>%1 minutes ago</source>
- <translation>%1 分鐘前</translation>
- </message>
- <message>
- <location filename="../src/app/messagesadapter.cpp" line="600"/>
+ <location filename="../src/app/messagesadapter.cpp" line="598"/>
<source>just now</source>
<translation>現在</translation>
</message>
@@ -3695,132 +3680,132 @@ Copy and share it with your friends!</source>
<context>
<name>TipsModel</name>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="25"/>
+ <location filename="../src/app/tipsmodel.cpp" line="28"/>
<source>Customize</source>
<translation>自定义</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="28"/>
+ <location filename="../src/app/tipsmodel.cpp" line="31"/>
<source>What does Jami mean?</source>
<translation>Jami 有何含义？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="34"/>
+ <location filename="../src/app/tipsmodel.cpp" line="37"/>
<source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="30"/>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>The 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="26"/>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
<source>Backup account</source>
<translation>备份账户</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="36"/>
+ <location filename="../src/app/tipsmodel.cpp" line="39"/>
<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="41"/>
+ <location filename="../src/app/tipsmodel.cpp" line="44"/>
<source>Why should I back up my account?</source>
<translation>为什么应该备份账户？</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="43"/>
+ <location filename="../src/app/tipsmodel.cpp" line="46"/>
<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>Jami是分布式，你的账号仅保存在本地设备里。如果你忘记密码或丢失本地账号数据，也没有提前备份的话，你将无法恢复你的账号。</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="49"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="55"/>
+ <location filename="../src/app/tipsmodel.cpp" line="58"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="58"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
<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="64"/>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
<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="66"/>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
<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="73"/>
+ <location filename="../src/app/tipsmodel.cpp" line="76"/>
<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="93"/>
+ <location filename="../src/app/tipsmodel.cpp" line="96"/>
<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="97"/>
+ <location filename="../src/app/tipsmodel.cpp" line="100"/>
<source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="99"/>
+ <location filename="../src/app/tipsmodel.cpp" line="102"/>
<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="71"/>
+ <location filename="../src/app/tipsmodel.cpp" line="74"/>
<source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="54"/>
<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="79"/>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
<source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
+ <location filename="../src/app/tipsmodel.cpp" line="84"/>
<source>The most permanent, secure identifier 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="86"/>
+ <location filename="../src/app/tipsmodel.cpp" line="89"/>
<source>How can I back up my account?</source>
<translation>怎样备份账户?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
+ <location filename="../src/app/tipsmodel.cpp" line="90"/>
<source>In Account Settings, a button is available to create a backup your account.</source>
<translation>在账户设置里，创建备份账户的按钮可用</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
<source>What happens when I delete my account?</source>
<translation>删除自己的账号会发生什么?</translation>
</message>
--
GitLab