From 8bc490257658acfcef01c8f15cc22cb3540dea3c Mon Sep 17 00:00:00 2001 From: Jenkins <jenkins@ring-packaging.cx> Date: Mon, 5 Jul 2021 16:42:59 -0400 Subject: [PATCH] i18n: automatic bump Change-Id: Ie86cd0fc63efe10c4b77e88cf6c6e8cd3dbd1b2c --- translations/ring_client_windows.ts | 30 ++-- translations/ring_client_windows_ar.ts | 30 ++-- translations/ring_client_windows_bg.ts | 30 ++-- translations/ring_client_windows_ca.ts | 36 ++-- translations/ring_client_windows_cs_CZ.ts | 36 ++-- translations/ring_client_windows_da.ts | 34 ++-- translations/ring_client_windows_da_DK.ts | 30 ++-- translations/ring_client_windows_de.ts | 36 ++-- translations/ring_client_windows_de_DE.ts | 36 ++-- translations/ring_client_windows_el.ts | 30 ++-- translations/ring_client_windows_en_GB.ts | 30 ++-- translations/ring_client_windows_eo.ts | 30 ++-- translations/ring_client_windows_es.ts | 36 ++-- translations/ring_client_windows_es_AR.ts | 36 ++-- translations/ring_client_windows_es_CO.ts | 36 ++-- translations/ring_client_windows_es_MX.ts | 30 ++-- translations/ring_client_windows_et.ts | 30 ++-- translations/ring_client_windows_et_EE.ts | 30 ++-- translations/ring_client_windows_eu.ts | 30 ++-- translations/ring_client_windows_fa_IR.ts | 36 ++-- translations/ring_client_windows_fi.ts | 36 ++-- translations/ring_client_windows_fr.ts | 38 ++--- translations/ring_client_windows_fr_BE.ts | 30 ++-- translations/ring_client_windows_fr_CA.ts | 30 ++-- translations/ring_client_windows_fr_CH.ts | 30 ++-- translations/ring_client_windows_fr_FR.ts | 30 ++-- translations/ring_client_windows_gl.ts | 36 ++-- translations/ring_client_windows_he.ts | 30 ++-- translations/ring_client_windows_hi.ts | 30 ++-- translations/ring_client_windows_hi_IN.ts | 30 ++-- translations/ring_client_windows_hr.ts | 30 ++-- translations/ring_client_windows_hu.ts | 38 ++--- translations/ring_client_windows_id.ts | 30 ++-- translations/ring_client_windows_it.ts | 38 ++--- translations/ring_client_windows_it_IT.ts | 38 ++--- translations/ring_client_windows_ja.ts | 166 +++++++++---------- translations/ring_client_windows_ko_KR.ts | 30 ++-- translations/ring_client_windows_lt.ts | 36 ++-- translations/ring_client_windows_ms.ts | 30 ++-- translations/ring_client_windows_nb.ts | 36 ++-- translations/ring_client_windows_nb_NO.ts | 30 ++-- translations/ring_client_windows_nl.ts | 36 ++-- translations/ring_client_windows_nl_BE.ts | 36 ++-- translations/ring_client_windows_nl_NL.ts | 30 ++-- translations/ring_client_windows_oc.ts | 30 ++-- translations/ring_client_windows_pa.ts | 30 ++-- translations/ring_client_windows_pl.ts | 36 ++-- translations/ring_client_windows_pl_PL.ts | 36 ++-- translations/ring_client_windows_pt.ts | 36 ++-- translations/ring_client_windows_pt_BR.ts | 36 ++-- translations/ring_client_windows_pt_PT.ts | 36 ++-- translations/ring_client_windows_ro.ts | 30 ++-- translations/ring_client_windows_ro_RO.ts | 38 ++--- translations/ring_client_windows_ru.ts | 92 +++++----- translations/ring_client_windows_ru_RU.ts | 36 ++-- translations/ring_client_windows_sk_SK.ts | 36 ++-- translations/ring_client_windows_sl.ts | 36 ++-- translations/ring_client_windows_sq_AL.ts | 36 ++-- translations/ring_client_windows_sr@latin.ts | 30 ++-- translations/ring_client_windows_sr_RS.ts | 30 ++-- translations/ring_client_windows_sv.ts | 36 ++-- translations/ring_client_windows_ta.ts | 30 ++-- translations/ring_client_windows_tr.ts | 38 ++--- translations/ring_client_windows_tr_TR.ts | 30 ++-- translations/ring_client_windows_uk.ts | 36 ++-- translations/ring_client_windows_uk_UA.ts | 30 ++-- translations/ring_client_windows_vi.ts | 30 ++-- translations/ring_client_windows_zh.ts | 30 ++-- translations/ring_client_windows_zh_CN.ts | 36 ++-- translations/ring_client_windows_zh_TW.ts | 38 ++--- 70 files changed, 1222 insertions(+), 1292 deletions(-) diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts index c688c0dda..9628e3180 100644 --- a/translations/ring_client_windows.ts +++ b/translations/ring_client_windows.ts @@ -189,12 +189,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"></translation> </message> @@ -297,13 +297,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"></translation> </message> <message> @@ -1672,6 +1672,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,17 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts index ce495220d..3b774fc11 100644 --- a/translations/ring_client_windows_ar.ts +++ b/translations/ring_client_windows_ar.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>توقف</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts index 39b90cfa5..c3b7e781f 100644 --- a/translations/ring_client_windows_bg.ts +++ b/translations/ring_client_windows_bg.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Спиране</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts index 4723248a0..c93e774d4 100644 --- a/translations/ring_client_windows_ca.ts +++ b/translations/ring_client_windows_ca.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nou missatge</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Petició de confiança</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>No s'ha pogut reconnectar al dimoni Jami (dring). -Jami es tancarà ara.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Intentant reconnectar al dimoni Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami es tancarà ara.</translation> <source>Stop</source> <translation>Para</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Copiï'l i comparteixi'l amb els seus amics!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Intentant reconnectar al dimoni Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>No s'ha pogut reconnectar al dimoni Jami (dring). -Jami es tancarà ara.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_cs_CZ.ts b/translations/ring_client_windows_cs_CZ.ts index 03e3391e1..d61250547 100644 --- a/translations/ring_client_windows_cs_CZ.ts +++ b/translations/ring_client_windows_cs_CZ.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nová zpráva</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Žádosti o důvěru</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Nelze se znovu připojit k démonu Jami (dring). -Jami nyní bude ukončen.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Pokouším se znovu připojit k démonu Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Přejete si nyní provést aktualizaci?</translation> <source>Stop</source> <translation>Zastavit</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Zkopírujte je a sdílejte je se svými přáteli!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Pokouším se znovu připojit k démonu Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Nelze se znovu připojit k démonu Jami (dring). -Jami nyní bude ukončen.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_da.ts b/translations/ring_client_windows_da.ts index 89cf86e08..42645cf38 100644 --- a/translations/ring_client_windows_da.ts +++ b/translations/ring_client_windows_da.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Ny besked</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Hav tillid til anmodning</translation> </message> @@ -295,14 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Kunne ikke genoprette forbindelsen til Jami-servicen (dring). Jami lukker nu.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Forsøger at genoprette forbindelse til Jami-servicen (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1973,17 +1984,6 @@ Kopier og del det med dine venner!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Forsøger at genoprette forbindelse til Jami-servicen (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Kunne ikke genoprette forbindelsen til Jami-servicen (dring). Jami lukker nu.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts index 472ca4e37..0d417ea9f 100644 --- a/translations/ring_client_windows_da_DK.ts +++ b/translations/ring_client_windows_da_DK.ts @@ -189,12 +189,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"></translation> </message> @@ -297,13 +297,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"></translation> </message> <message> @@ -1672,6 +1672,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,17 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts index eee6b3811..db9c50e62 100644 --- a/translations/ring_client_windows_de.ts +++ b/translations/ring_client_windows_de.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Neue Nachricht</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Anfrage vertrauen</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Neuverbindung zum Jami-Daemon (dring) fehlgeschlagen. -Jami wird nun beendet.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Neuer Verbindungsversuch zum Jami-Daemon (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami wird nun beendet.</translation> <source>Stop</source> <translation>Stop</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Kopieren und teilen Sie diesen mit Ihren Freunden!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Neuer Verbindungsversuch zum Jami-Daemon (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Neuverbindung zum Jami-Daemon (dring) fehlgeschlagen. -Jami wird nun beendet.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_de_DE.ts b/translations/ring_client_windows_de_DE.ts index d3f8acdde..e5ce45081 100644 --- a/translations/ring_client_windows_de_DE.ts +++ b/translations/ring_client_windows_de_DE.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Neue Nachricht</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Vertrauensbeweis gefordert</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Verbindung mit Jami-Hintergrundprozess (dring) konnte nicht wiederhergestellt werden. -Jami wird jetzt beendet.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Versuche wieder mit dem Jami-Hintergrundprozess zu verbinden (dring)</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Möchten Sie jetzt aktualisieren? </translation> <source>Stop</source> <translation>Beenden</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Kopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Versuche wieder mit dem Jami-Hintergrundprozess zu verbinden (dring)</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Verbindung mit Jami-Hintergrundprozess (dring) konnte nicht wiederhergestellt werden. -Jami wird jetzt beendet.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts index cc42ec3e6..a5d8d6030 100644 --- a/translations/ring_client_windows_el.ts +++ b/translations/ring_client_windows_el.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Τερματισμός</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts index a525b129d..60479a432 100644 --- a/translations/ring_client_windows_en_GB.ts +++ b/translations/ring_client_windows_en_GB.ts @@ -189,12 +189,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"></translation> </message> @@ -297,13 +297,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"></translation> </message> <message> @@ -1672,6 +1672,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,17 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts index d917463e4..ee56956b6 100644 --- a/translations/ring_client_windows_eo.ts +++ b/translations/ring_client_windows_eo.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Stopi</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts index 2a99300e1..195d8fd44 100644 --- a/translations/ring_client_windows_es.ts +++ b/translations/ring_client_windows_es.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nuevo mensaje</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Solicitud de confianza</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>No se pudo volver a conectar con el demonio Jami (dring). -Jami ahora se cerrará.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Tratando de conectarse de nuevo al demonio Jami (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Jami ahora se cerrará.</translation> <source>Stop</source> <translation>Parar</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation>Eliminar moderador por defecto</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Tratando de conectarse de nuevo al demonio Jami (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>No se pudo volver a conectar con el demonio Jami (dring). -Jami ahora se cerrará.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_es_AR.ts b/translations/ring_client_windows_es_AR.ts index 61d712a95..ec1012041 100644 --- a/translations/ring_client_windows_es_AR.ts +++ b/translations/ring_client_windows_es_AR.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nuevo mensaje</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Solicitud de confianza</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>No se pudo volver a conectar con el demonio Jami (dring). -Ahora Jami se cerrará.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Intentando reconectar con el demonio Jami (dring) ...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Ahora Jami se cerrará.</translation> <source>Stop</source> <translation>Detener</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation>Eliminar moderador por defecto</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Intentando reconectar con el demonio Jami (dring) ...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>No se pudo volver a conectar con el demonio Jami (dring). -Ahora Jami se cerrará.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_es_CO.ts b/translations/ring_client_windows_es_CO.ts index e3ee45af6..7692d0c2a 100644 --- a/translations/ring_client_windows_es_CO.ts +++ b/translations/ring_client_windows_es_CO.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Mensaje nuevo</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Petición de confianza</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Imposible reconectarse al demonio de Jami (dring). -Jami finalizará ahora.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Intentando conectarse al demonio de Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami finalizará ahora.</translation> <source>Stop</source> <translation>Detener</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Intentando conectarse al demonio de Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Imposible reconectarse al demonio de Jami (dring). -Jami finalizará ahora.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_es_MX.ts b/translations/ring_client_windows_es_MX.ts index 151129d9f..561a7999d 100644 --- a/translations/ring_client_windows_es_MX.ts +++ b/translations/ring_client_windows_es_MX.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_et.ts b/translations/ring_client_windows_et.ts index 382d8f0ab..23fecd3d9 100644 --- a/translations/ring_client_windows_et.ts +++ b/translations/ring_client_windows_et.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts index 1f85c0e33..1bcbabe18 100644 --- a/translations/ring_client_windows_et_EE.ts +++ b/translations/ring_client_windows_et_EE.ts @@ -189,12 +189,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"></translation> </message> @@ -297,13 +297,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"></translation> </message> <message> @@ -1672,6 +1672,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,17 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_eu.ts b/translations/ring_client_windows_eu.ts index 51aa12748..e56db1343 100644 --- a/translations/ring_client_windows_eu.ts +++ b/translations/ring_client_windows_eu.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_fa_IR.ts b/translations/ring_client_windows_fa_IR.ts index 63b76ffa3..21fe9bd86 100644 --- a/translations/ring_client_windows_fa_IR.ts +++ b/translations/ring_client_windows_fa_IR.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>پیام جدید</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>درخواست اعتماد</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>عدم توانایی در اتصال مجدد به دیمن Jami (dring). -Jami اکنون بسته خواهد شد.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>تلاش برای اتصال مجدد به دیمن Jami (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Jami اکنون بسته خواهد شد.</translation> <source>Stop</source> <translation>پایان</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>تلاش برای اتصال مجدد به دیمن Jami (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>عدم توانایی در اتصال مجدد به دیمن Jami (dring). -Jami اکنون بسته خواهد شد.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts index 66b76673d..1e932882b 100644 --- a/translations/ring_client_windows_fi.ts +++ b/translations/ring_client_windows_fi.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Uusi viesti</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Luottamuspyyntö</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Ei voinut muodostaa yhteyttä uudelleen Jami-taustapalveluun (dring). -Jami sulkeutuu nyt.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Yritetään muodostaa yhteys Jami-taustapalveluun (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Haluatko päivittää nyt?</translation> <source>Stop</source> <translation>Lopeta</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Kopioi ja jaa se ystäviesi kanssa!</translation> <source>Remove default moderator</source> <translation>Poista oletus valvoja</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Yritetään muodostaa yhteys Jami-taustapalveluun (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Ei voinut muodostaa yhteyttä uudelleen Jami-taustapalveluun (dring). -Jami sulkeutuu nyt.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts index c8c7130b3..b9f0dc037 100644 --- a/translations/ring_client_windows_fr.ts +++ b/translations/ring_client_windows_fr.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nouveau message</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Invitation</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Impossible de se reconnecter au service Jami (dring). -Le programme va maintenant se terminer.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Tentative de reconnexion au service Jami (dring) …</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1565,7 +1564,7 @@ Notez que le mot de passe ne peut être récupéré.</translation> <message> <location filename="../src/constant/JamiStrings.qml" line="320"/> <source>Display hyperlink previews in the chatview</source> - <translation type="unfinished"/> + <translation>Afficher les aperçus des liens </translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="323"/> @@ -1674,6 +1673,17 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation> <source>Stop</source> <translation>Stop</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1976,18 +1986,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation>Supprimer un modérateur par défaut</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Redémarrage de Jami en cours …</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Impossible de se reconnecter au daemon Jami (dring). -Le programme va maintenant se terminer.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_fr_BE.ts b/translations/ring_client_windows_fr_BE.ts index aaa63d954..e62d6cdb3 100644 --- a/translations/ring_client_windows_fr_BE.ts +++ b/translations/ring_client_windows_fr_BE.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_fr_CA.ts b/translations/ring_client_windows_fr_CA.ts index e80fd6b7c..d1a10eafc 100644 --- a/translations/ring_client_windows_fr_CA.ts +++ b/translations/ring_client_windows_fr_CA.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Arrêter</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_fr_CH.ts b/translations/ring_client_windows_fr_CH.ts index f2ad2ddf0..95550bd4c 100644 --- a/translations/ring_client_windows_fr_CH.ts +++ b/translations/ring_client_windows_fr_CH.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_fr_FR.ts b/translations/ring_client_windows_fr_FR.ts index deca38206..5920d8f06 100644 --- a/translations/ring_client_windows_fr_FR.ts +++ b/translations/ring_client_windows_fr_FR.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Arrêter</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_gl.ts b/translations/ring_client_windows_gl.ts index da8993379..ddad01e8f 100644 --- a/translations/ring_client_windows_gl.ts +++ b/translations/ring_client_windows_gl.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nova mensaxe</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Confiar na solicitude</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Non se puido reconectar co demoño Jami (dring). -Jami vai pechar agora.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Intentando reconectar co demoño Jami (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami vai pechar agora.</translation> <source>Stop</source> <translation>Deter</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Copiao e compárteo coas túas amizades!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Intentando reconectar co demoño Jami (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Non se puido reconectar co demoño Jami (dring). -Jami vai pechar agora.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts index 8b0c624b3..a373bbb6c 100644 --- a/translations/ring_client_windows_he.ts +++ b/translations/ring_client_windows_he.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>עצור</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_hi.ts b/translations/ring_client_windows_hi.ts index fbc81493e..8e4efb33f 100644 --- a/translations/ring_client_windows_hi.ts +++ b/translations/ring_client_windows_hi.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts index a7ff789c3..dc75c4de0 100644 --- a/translations/ring_client_windows_hi_IN.ts +++ b/translations/ring_client_windows_hi_IN.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts index 88957e6e9..18a7c0d6e 100644 --- a/translations/ring_client_windows_hr.ts +++ b/translations/ring_client_windows_hr.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Prekini</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts index add481c14..ca8b2eee2 100644 --- a/translations/ring_client_windows_hu.ts +++ b/translations/ring_client_windows_hu.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Új üzenet</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Megbízható kérelem</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Nem sikerült újrakapcsolódni a Jami rendszerfolyamathoz (dring). -A Jami most kilép.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Újrakapcsolódás a Jami rendszerfolyamathoz (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1563,7 +1562,7 @@ A Jami most kilép.</translation> <message> <location filename="../src/constant/JamiStrings.qml" line="320"/> <source>Display hyperlink previews in the chatview</source> - <translation type="unfinished"/> + <translation>Hivatkozás előnézeteinek megjelenítése a csevegés nézetben</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="323"/> @@ -1671,6 +1670,17 @@ A Jami most kilép.</translation> <source>Stop</source> <translation>Megállítás</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Másolja ki, és ossza meg barátaival!</translation> <source>Remove default moderator</source> <translation>Alapértelmezett moderátor eltávolítása</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Újrakapcsolódás a Jami rendszerfolyamathoz (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Nem sikerült újrakapcsolódni a Jami rendszerfolyamathoz (dring). -A Jami most kilép.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts index 35d6e9952..f5a2933cb 100644 --- a/translations/ring_client_windows_id.ts +++ b/translations/ring_client_windows_id.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Pesan baru</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts index 92098a60b..dc9f893f0 100644 --- a/translations/ring_client_windows_it.ts +++ b/translations/ring_client_windows_it.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nuovo messaggio</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Richiesta fidata</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Impossibile riconnettersi al demone Jami (dring). -Jami ora si chiuderà.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Tentativo di riconnessione al demone Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1563,7 +1562,7 @@ Jami ora si chiuderà.</translation> <message> <location filename="../src/constant/JamiStrings.qml" line="320"/> <source>Display hyperlink previews in the chatview</source> - <translation type="unfinished"/> + <translation>Visualizza le anteprime dei collegamenti ipertestuali nella vista chat</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="323"/> @@ -1672,6 +1671,17 @@ Vuoi aggiornare ora?</translation> <source>Stop</source> <translation>Stop</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Copia e condividi con i tuoi amici!</translation> <source>Remove default moderator</source> <translation>Rimuovi moderatore predefinito</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Tentativo di riconnessione al demone Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Impossibile riconnettersi al demone Jami (dring). -Jami ora si chiuderà.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_it_IT.ts b/translations/ring_client_windows_it_IT.ts index c7b2be278..503556438 100644 --- a/translations/ring_client_windows_it_IT.ts +++ b/translations/ring_client_windows_it_IT.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nuovo messaggio</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Richiesta fidata</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Impossibile riconnettersi al demone Jami (dring). -Jami ora si chiuderà.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Tentativo di riconnessione al demone Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1563,7 +1562,7 @@ Jami ora si chiuderà.</translation> <message> <location filename="../src/constant/JamiStrings.qml" line="320"/> <source>Display hyperlink previews in the chatview</source> - <translation type="unfinished"/> + <translation>Visualizza le anteprime dei link nella vista chat</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="323"/> @@ -1672,6 +1671,17 @@ Vuoi aggiornare ora?</translation> <source>Stop</source> <translation>Stop</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Copia e condividi con i tuoi amici!</translation> <source>Remove default moderator</source> <translation>Rimuovi moderatore predefinito</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Tentativo di riconnessione al demone Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Impossibile riconnettersi al demone Jami (dring). -Jami ora si chiuderà.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts index 76e7cd682..22c3deb5b 100644 --- a/translations/ring_client_windows_ja.ts +++ b/translations/ring_client_windows_ja.ts @@ -28,12 +28,12 @@ <message> <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="87"/> <source>Audio Files</source> - <translation type="unfinished"/> + <translation>音声ファイル</translation> </message> <message> <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="87"/> <source>All files</source> - <translation type="unfinished"/> + <translation>全てのファイル</translation> </message> </context> <context> @@ -49,12 +49,12 @@ <location filename="../src/settingsview/components/AdvancedJamiSecuritySettings.qml" line="94"/> <location filename="../src/settingsview/components/AdvancedJamiSecuritySettings.qml" line="114"/> <source>All files</source> - <translation type="unfinished"/> + <translation>全てのファイル</translation> </message> <message> <location filename="../src/settingsview/components/AdvancedJamiSecuritySettings.qml" line="114"/> <source>Key File</source> - <translation type="unfinished"/> + <translation>鍵ファイル</translation> </message> </context> <context> @@ -83,12 +83,12 @@ <location filename="../src/settingsview/components/AdvancedSIPSecuritySettings.qml" line="113"/> <location filename="../src/settingsview/components/AdvancedSIPSecuritySettings.qml" line="131"/> <source>All files</source> - <translation type="unfinished"/> + <translation>全てのファイル</translation> </message> <message> <location filename="../src/settingsview/components/AdvancedSIPSecuritySettings.qml" line="131"/> <source>Key File</source> - <translation type="unfinished"/> + <translation>鍵ファイル</translation> </message> </context> <context> @@ -104,12 +104,12 @@ <message> <location filename="../src/wizardview/components/BackupKeyPage.qml" line="48"/> <source>Jami archive files</source> - <translation type="unfinished"/> + <translation>Jamiアーカイブファイル</translation> </message> <message> <location filename="../src/wizardview/components/BackupKeyPage.qml" line="48"/> <source>All files</source> - <translation type="unfinished"/> + <translation>全てのファイル</translation> </message> </context> <context> @@ -125,17 +125,17 @@ <message> <location filename="../src/calladapter.cpp" line="129"/> <source>Missed call</source> - <translation type="unfinished"/> + <translation>不在着信</translation> </message> <message> <location filename="../src/calladapter.cpp" line="130"/> <source>Missed call from %1</source> - <translation type="unfinished"/> + <translation>%1から不在着信</translation> </message> <message> <location filename="../src/calladapter.cpp" line="496"/> <source>me</source> - <translation type="unfinished"/> + <translation>自分</translation> </message> <message> <location filename="../src/calladapter.cpp" line="557"/> @@ -145,12 +145,12 @@ <message> <location filename="../src/calladapter.cpp" line="558"/> <source>%1 is calling you</source> - <translation type="unfinished"/> + <translation>%1から着信があります</translation> </message> <message> <location filename="../src/calladapter.cpp" line="569"/> <source>is calling you</source> - <translation type="unfinished"/> + <translation>着信があります</translation> </message> </context> <context> @@ -163,7 +163,7 @@ <message> <location filename="../src/wizardview/components/CollapsiblePasswordWidget.qml" line="98"/> <source>Confirm Password</source> - <translation type="unfinished"/> + <translation>暗証語の再入力</translation> </message> </context> <context> @@ -176,25 +176,25 @@ <message> <location filename="../src/mainview/components/ContactPicker.qml" line="87"/> <source>Transfer this call</source> - <translation type="unfinished"/> + <translation>この通話を転送</translation> </message> <message> <location filename="../src/mainview/components/ContactPicker.qml" line="89"/> <source>Add default moderator</source> - <translation type="unfinished"/> + <translation>既定担当者を追加</translation> </message> </context> <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> - <translation type="unfinished"/> + <translation>新規メッセージ</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> - <translation type="unfinished"/> + <translation>要求を信頼</translation> </message> </context> <context> @@ -202,12 +202,12 @@ <message> <location filename="../src/wizardview/components/CreateAccountPage.qml" line="76"/> <source>Jami archive files</source> - <translation type="unfinished"/> + <translation>Jamiアーカイブファイル</translation> </message> <message> <location filename="../src/wizardview/components/CreateAccountPage.qml" line="76"/> <source>All files</source> - <translation type="unfinished"/> + <translation>全てのファイル</translation> </message> <message> <location filename="../src/wizardview/components/CreateAccountPage.qml" line="121"/> @@ -222,7 +222,7 @@ <message> <location filename="../src/wizardview/components/CreateAccountPage.qml" line="149"/> <source>Choose a name</source> - <translation type="unfinished"/> + <translation>名前を選択</translation> </message> <message> <location filename="../src/wizardview/components/CreateAccountPage.qml" line="164"/> @@ -232,7 +232,7 @@ <message> <location filename="../src/wizardview/components/CreateAccountPage.qml" line="164"/> <source>Invalid name</source> - <translation type="unfinished"/> + <translation>不正な名前</translation> </message> <message> <location filename="../src/wizardview/components/CreateAccountPage.qml" line="166"/> @@ -242,7 +242,7 @@ <message> <location filename="../src/wizardview/components/CreateAccountPage.qml" line="166"/> <source>Name already taken</source> - <translation type="unfinished"/> + <translation>この名前はすでに取得されています</translation> </message> </context> <context> @@ -267,12 +267,12 @@ <message> <location filename="../src/settingsview/components/CurrentAccountSettings.qml" line="156"/> <source>Jami archive files</source> - <translation type="unfinished"/> + <translation>Jamiアーカイブファイル</translation> </message> <message> <location filename="../src/settingsview/components/CurrentAccountSettings.qml" line="156"/> <source>All files</source> - <translation type="unfinished"/> + <translation>全てのファイル</translation> </message> </context> <context> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -328,7 +328,7 @@ Jami will now quit.</source> <message> <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="120"/> <source>Device Id</source> - <translation type="unfinished"/> + <translation>機器識別子</translation> </message> </context> <context> @@ -336,12 +336,12 @@ Jami will now quit.</source> <message> <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="64"/> <source>Jami archive files</source> - <translation type="unfinished"/> + <translation>Jamiアーカイブファイル</translation> </message> <message> <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="64"/> <source>All files</source> - <translation type="unfinished"/> + <translation>全てのファイル</translation> </message> <message> <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="88"/> @@ -351,12 +351,12 @@ Jami will now quit.</source> <message> <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="159"/> <source>Generating account…</source> - <translation type="unfinished"/> + <translation>アカウントを生成中…</translation> </message> <message> <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="204"/> <source>Back to welcome page</source> - <translation type="unfinished"/> + <translation>歓迎画面に戻る</translation> </message> <message> <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="141"/> @@ -374,12 +374,12 @@ Jami will now quit.</source> <message> <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="140"/> <source>Generating account…</source> - <translation type="unfinished"/> + <translation>アカウントを生成中…</translation> </message> <message> <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="180"/> <source>Back to welcome page</source> - <translation type="unfinished"/> + <translation>歓迎画面に戻る</translation> </message> <message> <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="123"/> @@ -392,12 +392,12 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="37"/> <source>Find a user or search for a conversation</source> - <translation type="unfinished"/> + <translation>利用者を見付けたり会話を検索したりしましょう</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="38"/> <source>Search your invitations</source> - <translation type="unfinished"/> + <translation>送信した招待を検索</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="39"/> @@ -407,7 +407,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="40"/> <source>Jami is free software for universal communication which respects the freedoms and the privacy of its users.</source> - <translation type="unfinished"/> + <translation>Jamiは世界中の利用者と繋がることができる自由ソフトウェアであり,利用者の自由と私事権とを尊重しています。</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="43"/> @@ -522,7 +522,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="69"/> <source>Convert your account into a rendezvous point</source> - <translation type="unfinished"/> + <translation>アカウントを待合室に変換</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="70"/> @@ -723,7 +723,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="254"/> <source>Create a rendezvous point</source> - <translation type="unfinished"/> + <translation>待合室を作成</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="257"/> @@ -748,7 +748,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="319"/> <source>Enable typing indicators</source> - <translation type="unfinished"/> + <translation>自分の入力状況を表示</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="332"/> @@ -763,7 +763,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="371"/> <source>Enter the PIN from another configured Jami account. Use the "Link Another Device" feature to obtain a PIN.</source> - <translation type="unfinished"/> + <translation>他で構成されたJamiアカウントからのPINを入力します。PINは「他の機器を接続する」機能を用いて取得できます。</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="373"/> @@ -884,7 +884,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="103"/> <source>Auto Registration After Expired</source> - <translation type="unfinished"/> + <translation>期限切れの後 自動的に登録</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="105"/> @@ -1044,7 +1044,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="153"/> <source>Ringtone device</source> - <translation type="unfinished"/> + <translation>機器の着信音</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="154"/> @@ -1099,7 +1099,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="174"/> <source>Backup your account!</source> - <translation type="unfinished"/> + <translation>アカウントをバックアップしてください!</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="175"/> @@ -1154,19 +1154,19 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="189"/> <source>is calling you</source> - <translation type="unfinished"/> + <translation>着信があります</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="192"/> <location filename="../src/constant/JamiStrings.qml" line="465"/> <source>Mute</source> - <translation type="unfinished"/> + <translation>消音</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="193"/> <location filename="../src/constant/JamiStrings.qml" line="466"/> <source>Unmute</source> - <translation type="unfinished"/> + <translation>消音を解除</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="199"/> @@ -1181,7 +1181,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="201"/> <source>More options</source> - <translation type="unfinished"/> + <translation>詳細な設定</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="202"/> @@ -1326,7 +1326,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="242"/> <source>Enter Jami Account Management Server (JAMS) URL</source> - <translation type="unfinished"/> + <translation>Jamiアカウント管理サーバー (JAMS) URLを入力</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="243"/> @@ -1341,7 +1341,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="245"/> <source>Enter your JAMS credentials</source> - <translation type="unfinished"/> + <translation>JAMS資格情報を入力</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="246"/> @@ -1351,7 +1351,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="248"/> <source>Back to welcome page</source> - <translation type="unfinished"/> + <translation>歓迎画面に戻る</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="251"/> @@ -1391,12 +1391,12 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="264"/> <source>Create SIP account</source> - <translation type="unfinished"/> + <translation>SIPアカウントを作成</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="265"/> <source>Configure an existing SIP account</source> - <translation type="unfinished"/> + <translation>既存のSIPアカウントを構成</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="268"/> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>停止</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1734,17 +1745,17 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="364"/> <source>You can obtain an archive by clicking on "Backup account" in the account settings. This will create a .gz file on your device.</source> - <translation type="unfinished"/> + <translation>アカウント設定で「アカウントをバックアップする」を実行してアーカイブを取得できます。機器に.gzファイルが保存されます。</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="367"/> <source>Restore an account from backup</source> - <translation type="unfinished"/> + <translation>バックアップからアカウントを復元</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="370"/> <source>Enter Jami account password</source> - <translation type="unfinished"/> + <translation>Jamiアカウントの暗証語を入力してください</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="376"/> @@ -1876,12 +1887,12 @@ Copy and share it with your friends!</source> <message> <location filename="../src/constant/JamiStrings.qml" line="435"/> <source>Link this device to an existing account</source> - <translation type="unfinished"/> + <translation>この機器を既存のアカウントと関連付ける</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="436"/> <source>Advanced features</source> - <translation type="unfinished"/> + <translation>高度な機能</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="437"/> @@ -1891,7 +1902,7 @@ Copy and share it with your friends!</source> <message> <location filename="../src/constant/JamiStrings.qml" line="438"/> <source>Connect to a JAMS server</source> - <translation type="unfinished"/> + <translation>JAMSサーバーに接続</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="440"/> @@ -1916,12 +1927,12 @@ Copy and share it with your friends!</source> <message> <location filename="../src/constant/JamiStrings.qml" line="463"/> <source>Set moderator</source> - <translation type="unfinished"/> + <translation>調停者を設定</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="464"/> <source>Unset moderator</source> - <translation type="unfinished"/> + <translation>担当者を取り消し</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="467"/> @@ -1966,24 +1977,13 @@ Copy and share it with your friends!</source> <message> <location filename="../src/constant/JamiStrings.qml" line="477"/> <source>Add default moderator</source> - <translation type="unfinished"/> + <translation>既定担当者を追加</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="478"/> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> @@ -2003,7 +2003,7 @@ Jami will now quit.</source> <message> <location filename="../src/settingsview/components/KeyBoardShortcutTable.qml" line="47"/> <source>Open account list</source> - <translation type="unfinished"/> + <translation>アカウント一覧を表示</translation> </message> <message> <location filename="../src/settingsview/components/KeyBoardShortcutTable.qml" line="52"/> @@ -2244,7 +2244,7 @@ Please try again later.</source> <message> <location filename="../src/commoncomponents/PhotoboothView.qml" line="105"/> <source>All files</source> - <translation type="unfinished"/> + <translation>全てのファイル</translation> </message> <message> <location filename="../src/commoncomponents/PhotoboothView.qml" line="252"/> @@ -2271,7 +2271,7 @@ Please try again later.</source> <message> <location filename="../src/mainview/components/PluginHandlerPicker.qml" line="109"/> <source>Choose plugin</source> - <translation type="unfinished"/> + <translation>追加機能を選択</translation> </message> <message> <location filename="../src/mainview/components/PluginHandlerPicker.qml" line="211"/> @@ -2330,7 +2330,7 @@ Please try again later.</source> <message> <location filename="../src/settingsview/components/PluginListSettingsView.qml" line="68"/> <source>All files</source> - <translation type="unfinished"/> + <translation>全てのファイル</translation> </message> <message> <location filename="../src/settingsview/components/PluginListSettingsView.qml" line="88"/> @@ -2351,7 +2351,7 @@ Please try again later.</source> <message> <location filename="../src/wizardview/components/ProfilePage.qml" line="78"/> <source>Profile is only shared with contacts</source> - <translation type="unfinished"/> + <translation>個人情報を共有できるのは連絡先だけです</translation> </message> <message> <location filename="../src/wizardview/components/ProfilePage.qml" line="86"/> @@ -2366,7 +2366,7 @@ Please try again later.</source> <message> <location filename="../src/wizardview/components/ProfilePage.qml" line="152"/> <source>Generating account…</source> - <translation type="unfinished"/> + <translation>アカウントを生成中…</translation> </message> </context> <context> @@ -2506,7 +2506,7 @@ Please try again later.</source> <message> <location filename="../src/settingsview/components/SettingsMenu.qml" line="42"/> <source>Plugin</source> - <translation type="unfinished"/> + <translation>プラグイン</translation> </message> </context> <context> @@ -2524,7 +2524,7 @@ Please try again later.</source> <message> <location filename="../src/settingsview/SettingsView.qml" line="158"/> <source>Plugin</source> - <translation type="unfinished"/> + <translation>プラグイン</translation> </message> </context> <context> diff --git a/translations/ring_client_windows_ko_KR.ts b/translations/ring_client_windows_ko_KR.ts index 2cef5b8ee..255565a58 100644 --- a/translations/ring_client_windows_ko_KR.ts +++ b/translations/ring_client_windows_ko_KR.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts index b78488a8a..71e4a8634 100644 --- a/translations/ring_client_windows_lt.ts +++ b/translations/ring_client_windows_lt.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nauja žinutė</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Nepavyko iš naujo prisijungti prie Jami tarnybos (dring). -Dabar, Jami baigs savo darbą.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Bandoma iš naujo prisijungti prie Jami tarnybos (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Dabar, Jami baigs savo darbą.</translation> <source>Stop</source> <translation>Stabdyti</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Nukopijuokite ir dalinkitės juo su draugais!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Bandoma iš naujo prisijungti prie Jami tarnybos (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Nepavyko iš naujo prisijungti prie Jami tarnybos (dring). -Dabar, Jami baigs savo darbą.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts index 1310a4411..810af7063 100644 --- a/translations/ring_client_windows_ms.ts +++ b/translations/ring_client_windows_ms.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Berhenti</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts index 66bf825f2..1214dac5f 100644 --- a/translations/ring_client_windows_nb.ts +++ b/translations/ring_client_windows_nb.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Ny melding</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Stol på henvendelse</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Klarte ikke koble opp forbindelsen igjen til Jami-bakgrunnsprosessen (dring). -Jami avslutter nå.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Forsøker å koble til Jami-bakgrunnsprosessen (dring) på nytt...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Jami avslutter nå.</translation> <source>Stop</source> <translation>Stopp</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Kopier og del det med dine venner!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Forsøker å koble til Jami-bakgrunnsprosessen (dring) på nytt...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Klarte ikke koble opp forbindelsen igjen til Jami-bakgrunnsprosessen (dring). -Jami avslutter nå.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_nb_NO.ts b/translations/ring_client_windows_nb_NO.ts index aea23424d..996bf6cc4 100644 --- a/translations/ring_client_windows_nb_NO.ts +++ b/translations/ring_client_windows_nb_NO.ts @@ -189,12 +189,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"></translation> </message> @@ -297,13 +297,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"></translation> </message> <message> @@ -1672,6 +1672,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,17 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts index 0c1f44977..b15149ebf 100644 --- a/translations/ring_client_windows_nl.ts +++ b/translations/ring_client_windows_nl.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nieuw bericht</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Vertrouwensverzoek</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Kon niet opnieuw verbinding maken met de Jami-daemon (dring). -Jami zal nu afsluiten.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Opnieuw verbinding maken met de Jami-daemon (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami zal nu afsluiten.</translation> <source>Stop</source> <translation>Stoppen</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Deel deze met uw vrienden!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Opnieuw verbinding maken met de Jami-daemon (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Kon niet opnieuw verbinding maken met de Jami-daemon (dring). -Jami zal nu afsluiten.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_nl_BE.ts b/translations/ring_client_windows_nl_BE.ts index 3fe724d54..993bed9d6 100644 --- a/translations/ring_client_windows_nl_BE.ts +++ b/translations/ring_client_windows_nl_BE.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nieuw bericht</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Vertrouwensverzoek</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Kon niet herverbinden met de Jami-daemon (dring). -Jami zal nu afsluiten.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Bezig met herverbinden met de Jami-daemon (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami zal nu afsluiten.</translation> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Deel hem met uw vrienden!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Bezig met herverbinden met de Jami-daemon (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Kon niet herverbinden met de Jami-daemon (dring). -Jami zal nu afsluiten.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_nl_NL.ts b/translations/ring_client_windows_nl_NL.ts index ff64f4049..62309617d 100644 --- a/translations/ring_client_windows_nl_NL.ts +++ b/translations/ring_client_windows_nl_NL.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Stoppen</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_oc.ts b/translations/ring_client_windows_oc.ts index 51b272cfb..2e897df87 100644 --- a/translations/ring_client_windows_oc.ts +++ b/translations/ring_client_windows_oc.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nòu messatge</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Arrestar</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1973,17 +1984,6 @@ Copiatz-lo e partejatz-lo a vòstres amics !</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts index 6f79ee6e4..89ce9fdb5 100644 --- a/translations/ring_client_windows_pa.ts +++ b/translations/ring_client_windows_pa.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts index d061a419e..329ad026f 100644 --- a/translations/ring_client_windows_pl.ts +++ b/translations/ring_client_windows_pl.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nowa wiadomość</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Rządanie zaufania</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Nie udało się ponownie połączyć z daemonem Jami (dring). -Jami się teraz wyłączy.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Próba połączenia z daemonem Jami (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Jami się teraz wyłączy.</translation> <source>Stop</source> <translation>Zatrzymaj</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation> <source>Remove default moderator</source> <translation>Usuń domyślnego moderatora</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Próba połączenia z daemonem Jami (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Nie udało się ponownie połączyć z daemonem Jami (dring). -Jami się teraz wyłączy.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_pl_PL.ts b/translations/ring_client_windows_pl_PL.ts index dd5d035fb..35597255f 100644 --- a/translations/ring_client_windows_pl_PL.ts +++ b/translations/ring_client_windows_pl_PL.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nowa wiadomość</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Rządanie zaufania</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Nie udało się ponownie połączyć z daemonem Jami (dring). -Jami się teraz wyłączy.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Próba połączenia z daemonem Jami (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami się teraz wyłączy.</translation> <source>Stop</source> <translation>Stop</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Próba połączenia z daemonem Jami (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Nie udało się ponownie połączyć z daemonem Jami (dring). -Jami się teraz wyłączy.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts index 0985ee46f..096f55960 100644 --- a/translations/ring_client_windows_pt.ts +++ b/translations/ring_client_windows_pt.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nova mensagem</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Confiar no pedido</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Não foi possível reconectar ao processo Jami (drink) .%s -O Jami vai agora desligar-se.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>A tentar reconectar ao processo Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ O Jami vai agora desligar-se.</translation> <source>Stop</source> <translation>Parar</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Copie e o partilhe-o com os seus amigos!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>A tentar reconectar ao processo Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Não foi possível reconectar ao processo Jami (drink) .%s -O Jami vai agora desligar-se.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_pt_BR.ts b/translations/ring_client_windows_pt_BR.ts index f2ec9e3ff..069a72fdf 100644 --- a/translations/ring_client_windows_pt_BR.ts +++ b/translations/ring_client_windows_pt_BR.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nova mensagem</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Confiar na requisição</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Não foi possível reconectar ao processo do Jami (drink) .%s -O Jami vai sair.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Tentando reconectar ao processo do Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Gostaria de atualizar agora?</translation> <source>Stop</source> <translation>Parar</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Copie-o e compartilhe com seus amigos!</translation> <source>Remove default moderator</source> <translation>Remover moderador padrão</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Tentando reconectar ao processo do Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Não foi possível reconectar ao processo do Jami (drink) .%s -O Jami vai sair.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_pt_PT.ts b/translations/ring_client_windows_pt_PT.ts index 8c9812917..e654544ab 100644 --- a/translations/ring_client_windows_pt_PT.ts +++ b/translations/ring_client_windows_pt_PT.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nova mensagem</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Confiar no pedido</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Não foi possível reconectar ao processo Jami (drink) .%s -O Jami vai agora desligar-se.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>A tentar reconectar ao processo Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ O Jami vai agora desligar-se.</translation> <source>Stop</source> <translation>Parar</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Copie e o partilhe-o com os seus amigos!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>A tentar reconectar ao processo Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Não foi possível reconectar ao processo Jami (drink) .%s -O Jami vai agora desligar-se.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts index fd9dfaa57..5d3caf6aa 100644 --- a/translations/ring_client_windows_ro.ts +++ b/translations/ring_client_windows_ro.ts @@ -189,12 +189,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"></translation> </message> @@ -297,13 +297,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"></translation> </message> <message> @@ -1672,6 +1672,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,17 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_ro_RO.ts b/translations/ring_client_windows_ro_RO.ts index 5a296bc83..d81ef64a1 100644 --- a/translations/ring_client_windows_ro_RO.ts +++ b/translations/ring_client_windows_ro_RO.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Mesaj nou</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Cerere de încredere</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Reconectare imposibilă la serviciul Jami (dring). -Jami se va închide acum.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Reconectare la serviciul Jami (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1563,7 +1562,7 @@ Jami se va închide acum.</translation> <message> <location filename="../src/constant/JamiStrings.qml" line="320"/> <source>Display hyperlink previews in the chatview</source> - <translation type="unfinished"/> + <translation>Previzualizează legăturile web în discuție</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="323"/> @@ -1672,6 +1671,17 @@ Jami se va închide acum.</translation> <source>Stop</source> <translation>Stop</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Copiază-l și distribuie-l prietenilor!</translation> <source>Remove default moderator</source> <translation>Elimină moderatorul prestabilit</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Reconectare la serviciul Jami (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Reconectare imposibilă la serviciul Jami (dring). -Jami se va închide acum.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts index 0a97a6766..0b4272c8e 100644 --- a/translations/ring_client_windows_ru.ts +++ b/translations/ring_client_windows_ru.ts @@ -130,7 +130,7 @@ <message> <location filename="../src/calladapter.cpp" line="130"/> <source>Missed call from %1</source> - <translation type="unfinished"/> + <translation>Пропущенный звонок от %1</translation> </message> <message> <location filename="../src/calladapter.cpp" line="496"/> @@ -145,7 +145,7 @@ <message> <location filename="../src/calladapter.cpp" line="558"/> <source>%1 is calling you</source> - <translation type="unfinished"/> + <translation>%1 звонит вам</translation> </message> <message> <location filename="../src/calladapter.cpp" line="569"/> @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Новое сообщение</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Запрос доверия</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Не удалось переподключиться к демону Jami (dring). -Завершение работы Jami.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Пробуем переподключиться к демону Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -513,12 +512,12 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="35"/> <source>Incoming audio call from {}</source> - <translation type="unfinished"/> + <translation>Входящий вызов от {}</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="36"/> <source>Incoming video call from {}</source> - <translation type="unfinished"/> + <translation>Входящий вызов от {}</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="69"/> @@ -653,7 +652,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="104"/> <source>Registration expiration time (seconds)</source> - <translation type="unfinished"/> + <translation>Срок действия регистрации (секунд)</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="117"/> @@ -865,12 +864,12 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="31"/> <source>Accept in audio</source> - <translation type="unfinished"/> + <translation>Принять в аудио</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="32"/> <source>Accept in video</source> - <translation type="unfinished"/> + <translation>Принять в видео</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="99"/> @@ -1187,7 +1186,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="202"/> <source>Mosaic</source> - <translation type="unfinished"/> + <translation>Мозаика</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="206"/> @@ -1282,7 +1281,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="229"/> <source>Select sharing method</source> - <translation type="unfinished"/> + <translation>Выберите метод доступа</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="230"/> @@ -1563,7 +1562,7 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="320"/> <source>Display hyperlink previews in the chatview</source> - <translation type="unfinished"/> + <translation>Отображение превью гиперссылок в окне чата</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="323"/> @@ -1635,17 +1634,17 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="341"/> <source>Troubleshoot</source> - <translation type="unfinished"/> + <translation>Устранение неполадок</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="342"/> <source>Open logs</source> - <translation type="unfinished"/> + <translation>Открыть журнал логов</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="343"/> <source>Get logs</source> - <translation type="unfinished"/> + <translation>Получить журнал логов</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="346"/> @@ -1655,37 +1654,48 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="349"/> <source>Debug</source> - <translation type="unfinished"/> + <translation>Отладка</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="350"/> <source>Show Stats</source> - <translation type="unfinished"/> + <translation>Показать статистику</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="351"/> <source>Start</source> - <translation type="unfinished"/> + <translation>Начать</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="352"/> <source>Stop</source> <translation>Стоп</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> - <translation type="unfinished"/> + <translation>Рой:</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="486"/> <source>True</source> - <translation type="unfinished"/> + <translation>Правда</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="487"/> <source>False</source> - <translation type="unfinished"/> + <translation>Ложь</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="205"/> @@ -1696,12 +1706,12 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="226"/> <source>Stop sharing screen or file</source> - <translation type="unfinished"/> + <translation>Остановить трансляцию или доступ к файлу</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="354"/> <source>Report Bug</source> - <translation type="unfinished"/> + <translation>Сообщить об ошибке</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="355"/> @@ -1711,12 +1721,12 @@ Jami will now quit.</source> <message> <location filename="../src/constant/JamiStrings.qml" line="357"/> <source>Copied to clipboard!</source> - <translation type="unfinished"/> + <translation>Cкопировано в буфер обмена!</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="358"/> <source>Receive Logs</source> - <translation type="unfinished"/> + <translation>Получить журнал логов</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="361"/> @@ -1908,7 +1918,7 @@ Copy and share it with your friends!</source> <message> <location filename="../src/constant/JamiStrings.qml" line="447"/> <source>Clear Text</source> - <translation type="unfinished"/> + <translation>Очистить Текст</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="449"/> @@ -1963,7 +1973,7 @@ Copy and share it with your friends!</source> <message> <location filename="../src/constant/JamiStrings.qml" line="476"/> <source>Make all participants moderators</source> - <translation type="unfinished"/> + <translation>Сделать всех участников модераторами</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="477"/> @@ -1975,18 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation>Удалить модератора по умолчанию</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Пробуем переподключиться к демону Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Не удалось переподключиться к демону Jami (dring). -Завершение работы Jami.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> @@ -2184,17 +2182,17 @@ Please try again later.</source> <message> <location filename="../src/mainapplication.cpp" line="482"/> <source>E&xit</source> - <translation type="unfinished"/> + <translation>В&ыход</translation> </message> <message> <location filename="../src/mainapplication.cpp" line="484"/> <source>&Quit</source> - <translation type="unfinished"/> + <translation>&Выход</translation> </message> <message> <location filename="../src/mainapplication.cpp" line="490"/> <source>&Show Jami</source> - <translation type="unfinished"/> + <translation>&Показать Jami</translation> </message> </context> <context> diff --git a/translations/ring_client_windows_ru_RU.ts b/translations/ring_client_windows_ru_RU.ts index f14e62c99..ef9eb6ba9 100644 --- a/translations/ring_client_windows_ru_RU.ts +++ b/translations/ring_client_windows_ru_RU.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Новое сообщение</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Запрос доверия</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Не удалось переподключиться к демону Jami (dring). -Завершение работы Jami.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Пробуем переподключиться к демону Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Стоп</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Пробуем переподключиться к демону Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Не удалось переподключиться к демону Jami (dring). -Завершение работы Jami.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts index c07ed49fa..fe470b4dd 100644 --- a/translations/ring_client_windows_sk_SK.ts +++ b/translations/ring_client_windows_sk_SK.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nová správa</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Veriť žiadosti</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Nepodarilo sa znovupripojenie k daemonovi Jami (dring). -Jami sa teraz vypne.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Prebieha pokus o znovupripojenie k daemonovi Jami (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami sa teraz vypne.</translation> <source>Stop</source> <translation>Zastaviť</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Skopírujte ho a zdieľajte s priateľmi!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Prebieha pokus o znovupripojenie k daemonovi Jami (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Nepodarilo sa znovupripojenie k daemonovi Jami (dring). -Jami sa teraz vypne.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_sl.ts b/translations/ring_client_windows_sl.ts index 76289c523..939525c63 100644 --- a/translations/ring_client_windows_sl.ts +++ b/translations/ring_client_windows_sl.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Novo sporočilo</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Zaupaj zahtevku</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Nisem se mogel znova povezati z Jami pritajenim demonom (dring). -Jami se bo sedaj zaprl.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Poskus ponovnega povezovanja z Jami pritajenim demonom (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Ali bi radi izvedli posodobitev?</translation> <source>Stop</source> <translation>Zaustavi</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Kopirajte ga in delite s prijatelji!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Poskus ponovnega povezovanja z Jami pritajenim demonom (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Nisem se mogel znova povezati z Jami pritajenim demonom (dring). -Jami se bo sedaj zaprl.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts index 4f9a0042d..e2db629e1 100644 --- a/translations/ring_client_windows_sq_AL.ts +++ b/translations/ring_client_windows_sq_AL.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Mesazh i ri</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Kërkesë besueshmërie</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>S’u rilidh dot me demonin Jami (dring). -Jami tani do të dalë.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Po provohet rilidhja me demonin Jami (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Jami tani do të dalë.</translation> <source>Stop</source> <translation>Ndale</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Kopjojeni dhe jepuani shokëve!</translation> <source>Remove default moderator</source> <translation>Hiq moderator parazgjedhje</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Po provohet rilidhja me demonin Jami (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>S’u rilidh dot me demonin Jami (dring). -Jami tani do të dalë.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_sr@latin.ts b/translations/ring_client_windows_sr@latin.ts index a4376d628..7b58aa789 100644 --- a/translations/ring_client_windows_sr@latin.ts +++ b/translations/ring_client_windows_sr@latin.ts @@ -189,12 +189,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"></translation> </message> @@ -297,13 +297,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"></translation> </message> <message> @@ -1672,6 +1672,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,17 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_sr_RS.ts b/translations/ring_client_windows_sr_RS.ts index 330510cb9..2101b1b0d 100644 --- a/translations/ring_client_windows_sr_RS.ts +++ b/translations/ring_client_windows_sr_RS.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts index a72506926..5c9fb7710 100644 --- a/translations/ring_client_windows_sv.ts +++ b/translations/ring_client_windows_sv.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Nytt meddelande</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Lita på begäran</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Kunde inte återansluta till Jami-tjänsten (dring). -Jami kommer nu att avslutas.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Försöker återansluta till Jami-tjänsten (dring)...</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami kommer nu att avslutas.</translation> <source>Stop</source> <translation>Stopp</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Kopiera och dela det med dina vänner!</translation> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Försöker återansluta till Jami-tjänsten (dring)...</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Kunde inte återansluta till Jami-tjänsten (dring). -Jami kommer nu att avslutas.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_ta.ts b/translations/ring_client_windows_ta.ts index cedb206c7..1fb129db9 100644 --- a/translations/ring_client_windows_ta.ts +++ b/translations/ring_client_windows_ta.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts index be9b01211..ae3deb4be 100644 --- a/translations/ring_client_windows_tr.ts +++ b/translations/ring_client_windows_tr.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>Yeni ileti</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>Güven isteği</translation> </message> @@ -295,16 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Jami uygulamasına bağlanılamadı (dring). -Jami uygulamasından çıkılacak.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Jami uygulamasına yeniden bağlanmayı deniyor -(dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1673,6 +1671,17 @@ Jami uygulamasından çıkılacak.</translation> <source>Stop</source> <translation>Durdur</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1976,19 +1985,6 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation> <source>Remove default moderator</source> <translation>Öntanımlı oturum başkanını kaldırın</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Jami uygulamasına yeniden bağlanmayı deniyor -(dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Jami uygulamasına bağlanılamadı (dring). -Jami uygulamasından çıkılacak.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_tr_TR.ts b/translations/ring_client_windows_tr_TR.ts index 16d503695..a8ce12b71 100644 --- a/translations/ring_client_windows_tr_TR.ts +++ b/translations/ring_client_windows_tr_TR.ts @@ -189,12 +189,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"></translation> </message> @@ -297,13 +297,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"></translation> </message> <message> @@ -1672,6 +1672,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,17 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts index 8c502f96d..c39326b85 100644 --- a/translations/ring_client_windows_uk.ts +++ b/translations/ring_client_windows_uk.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>Не вдалося повторно з'єднатися з сервісом Джамі (dring). -Джамі зараз закриється.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Спроба з'єднання з сервісом Джамі (dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1671,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation>Стоп</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,18 +1984,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>Спроба з'єднання з сервісом Джамі (dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>Не вдалося повторно з'єднатися з сервісом Джамі (dring). -Джамі зараз закриється.</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_uk_UA.ts b/translations/ring_client_windows_uk_UA.ts index e4988751a..a9ff8c0e1 100644 --- a/translations/ring_client_windows_uk_UA.ts +++ b/translations/ring_client_windows_uk_UA.ts @@ -189,12 +189,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"></translation> </message> @@ -297,13 +297,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"></translation> </message> <message> @@ -1672,6 +1672,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1974,17 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_vi.ts b/translations/ring_client_windows_vi.ts index 67eccdd70..5a5588e5e 100644 --- a/translations/ring_client_windows_vi.ts +++ b/translations/ring_client_windows_vi.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts index 4c6d3061d..59c33f37f 100644 --- a/translations/ring_client_windows_zh.ts +++ b/translations/ring_client_windows_zh.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation type="unfinished"/> </message> @@ -295,13 +295,13 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> <translation type="unfinished"/> </message> <message> @@ -1670,6 +1670,17 @@ Jami will now quit.</source> <source>Stop</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1972,17 +1983,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts index f7493ee4b..c9817c9bd 100644 --- a/translations/ring_client_windows_zh_CN.ts +++ b/translations/ring_client_windows_zh_CN.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>新消息</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>信任请求</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>无法连接至 Jami 守护进程(dring)。 -Jami 将立即退出。</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>正在重试连接 Jami 守护进程(dring)…</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1672,6 +1671,17 @@ Jami 将立即退出。</translation> <source>Stop</source> <translation>停止</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation>删除默认会议主持人</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>正在重试连接 Jami 守护进程(dring)…</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>无法连接至 Jami 守护进程(dring)。 -Jami 将立即退出。</translation> - </message> </context> <context> <name>JamiUserIdentity</name> diff --git a/translations/ring_client_windows_zh_TW.ts b/translations/ring_client_windows_zh_TW.ts index 6d13f14c2..470ae4e0d 100644 --- a/translations/ring_client_windows_zh_TW.ts +++ b/translations/ring_client_windows_zh_TW.ts @@ -187,12 +187,12 @@ <context> <name>ConversationsAdapter</name> <message> - <location filename="../src/conversationsadapter.cpp" line="208"/> + <location filename="../src/conversationsadapter.cpp" line="202"/> <source>New message</source> <translation>新訊息</translation> </message> <message> - <location filename="../src/conversationsadapter.cpp" line="253"/> + <location filename="../src/conversationsadapter.cpp" line="250"/> <source>Trust request</source> <translation>信任請求</translation> </message> @@ -295,15 +295,14 @@ <name>DaemonReconnectWindow</name> <message> <location filename="../src/DaemonReconnectWindow.qml" line="98"/> - <source>Could not re-connect to the Jami daemon (dring). + <source>Could not re-connect to the Jami daemon (jamid). Jami will now quit.</source> - <translation>無法重新連線到 Jami 幕後程式 (dring)。 -Jami 將會結束。</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="99"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>正在嘗試重新連線到 Jami 幕後程式 (dring)……</translation> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/DaemonReconnectWindow.qml" line="154"/> @@ -1563,7 +1562,7 @@ Jami 將會結束。</translation> <message> <location filename="../src/constant/JamiStrings.qml" line="320"/> <source>Display hyperlink previews in the chatview</source> - <translation type="unfinished"/> + <translation>在聊天檢視中顯示超連結預覽</translation> </message> <message> <location filename="../src/constant/JamiStrings.qml" line="323"/> @@ -1672,6 +1671,17 @@ Jami 將會結束。</translation> <source>Stop</source> <translation>停止</translation> </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="481"/> + <source>Trying to reconnect to the Jami daemon (jamid)…</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/constant/JamiStrings.qml" line="482"/> + <source>Could not re-connect to the Jami daemon (jamid). +Jami will now quit.</source> + <translation type="unfinished"/> + </message> <message> <location filename="../src/constant/JamiStrings.qml" line="485"/> <source>Is swarm:</source> @@ -1975,18 +1985,6 @@ Copy and share it with your friends!</source> <source>Remove default moderator</source> <translation>移除預設主持人</translation> </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="481"/> - <source>Trying to reconnect to the Jami daemon (dring)…</source> - <translation>正在嘗試重新連線到 Jami 幕後程式 (dring)……</translation> - </message> - <message> - <location filename="../src/constant/JamiStrings.qml" line="482"/> - <source>Could not re-connect to the Jami daemon (dring). -Jami will now quit.</source> - <translation>無法重新連線到 Jami 幕後程式 (dring)。 -Jami 將會結束。</translation> - </message> </context> <context> <name>JamiUserIdentity</name> -- GitLab