From e6a68e2bf74ed0ec357b119e8a300ccd5557f085 Mon Sep 17 00:00:00 2001 From: "DeepBlueV7.X" Date: Sun, 28 Jul 2019 00:25:23 +0000 Subject: Translated using Weblate (English) Currently translated at 31.6% (55 of 174 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/en/ --- resources/langs/nheko_en.ts | 92 ++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 170d1bf1..d8259dc5 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -55,12 +55,12 @@ Room creation failed: %1 - + Room creation failed: %1 Failed to leave room: %1 - + Failed to leave room: %1 @@ -68,28 +68,28 @@ All rooms - + All rooms Favourite rooms - + Favourite rooms Low priority rooms - + Low priority rooms (tag) - + (tag) (community) - + (community) @@ -97,22 +97,22 @@ Apply - + Apply Cancel - + Cancel Name - + Name Topic - + Topic @@ -120,7 +120,7 @@ Save File - + Save File @@ -128,7 +128,7 @@ Save image - + Save image @@ -136,7 +136,7 @@ Remove - + Remove @@ -144,57 +144,57 @@ Matrix ID - + Matrix ID e.g @joe:matrix.org - + e.g @joe:matrix.org Password - + Password Device name - + Device name LOGIN - + LOGIN Autodiscovery failed. Received malformed response. - + Autodiscovery failed. Received malformed response. Autodiscovery failed. Unknown error when requesting .well-known. - + Autodiscovery failed. Unknown error while requesting .well-known. The required endpoints were not found. Possibly not a Matrix server. - + The required endpoints were not found. Possibly not a Matrix server. Received malformed response. Make sure the homeserver domain is valid. - + Received malformed response. Make sure the homeserver domain is valid. An unknown error occured. Make sure the homeserver domain is valid. - + An unknown error occured. Make sure the homeserver domain is valid. Empty password - + Empty password @@ -202,7 +202,7 @@ Room members - + Room members @@ -215,7 +215,7 @@ Search for a room... - + Search for a room... @@ -223,47 +223,47 @@ Username - + Username Password - + Password Password confirmation - + Password confirmation Home Server - + Home Server REGISTER - + REGISTER Invalid username - + Invalid username Password is not long enough (min 8 chars) - + Password is not long enough (min 8 chars) Passwords don't match - + Passwords don't match Invalid server name - + Invalid server name @@ -271,7 +271,7 @@ Logout - + Logout @@ -279,7 +279,7 @@ no version stored - + no version stored @@ -287,17 +287,17 @@ Leave room - + Leave room Accept - + Accept Decline - + Decline @@ -305,27 +305,27 @@ User settings - + User settings Create new room - + Create new room Join a room - + Join a room Start a new chat - + Start a new chat Room directory - + Room directory -- cgit 1.5.1 From 75f7690790c70b4e08c9cecc12233146c8f1ffd6 Mon Sep 17 00:00:00 2001 From: "DeepBlueV7.X" Date: Sun, 28 Jul 2019 00:31:24 +0000 Subject: Translated using Weblate (German) Currently translated at 34.5% (60 of 174 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/de/ --- resources/langs/nheko_de.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 0404eca6..5e0c7e2e 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -97,7 +97,7 @@ Apply - + Anwenden @@ -107,7 +107,7 @@ Name - Titel + Name -- cgit 1.5.1 From 5fce4cb944a9e0277504343f9e0065ae0bb1ae07 Mon Sep 17 00:00:00 2001 From: Tulir Date: Sun, 28 Jul 2019 09:58:47 +0000 Subject: Added translation using Weblate (Finnish) --- resources/langs/nheko_fi.ts | 1004 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1004 insertions(+) create mode 100644 resources/langs/nheko_fi.ts (limited to 'resources') diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts new file mode 100644 index 00000000..e257f9d8 --- /dev/null +++ b/resources/langs/nheko_fi.ts @@ -0,0 +1,1004 @@ + + + + + AudioItem + + + Save File + + + + + ChatPage + + + Failed to upload image. Please try again. + + + + + Failed to upload file. Please try again. + + + + + Failed to upload audio. Please try again. + + + + + Failed to upload video. Please try again. + + + + + Failed to restore OLM account. Please login again. + + + + + Failed to restore save data. Please login again. + + + + + Failed to setup encryption keys. Server response: %1 %2. Please try again later. + + + + + + Please try to login again: %1 + + + + + Room creation failed: %1 + + + + + Failed to leave room: %1 + + + + + CommunitiesListItem + + + All rooms + + + + + Favourite rooms + + + + + Low priority rooms + + + + + + (tag) + + + + + (community) + + + + + EditModal + + + Apply + + + + + Cancel + + + + + Name + + + + + Topic + + + + + FileItem + + + Save File + + + + + ImageItem + + + Save image + + + + + InviteeItem + + + Remove + + + + + LoginPage + + + Matrix ID + + + + + e.g @joe:matrix.org + + + + + Password + + + + + Device name + + + + + LOGIN + + + + + Autodiscovery failed. Received malformed response. + + + + + Autodiscovery failed. Unknown error when requesting .well-known. + + + + + The required endpoints were not found. Possibly not a Matrix server. + + + + + Received malformed response. Make sure the homeserver domain is valid. + + + + + An unknown error occured. Make sure the homeserver domain is valid. + + + + + Empty password + + + + + MemberList + + + Room members + + + + + ESC + + + + + QuickSwitcher + + + Search for a room... + + + + + RegisterPage + + + Username + + + + + Password + + + + + Password confirmation + + + + + Home Server + + + + + REGISTER + + + + + Invalid username + + + + + Password is not long enough (min 8 chars) + + + + + Passwords don't match + + + + + Invalid server name + + + + + ReplyPopup + + + Logout + + + + + RoomInfo + + + no version stored + + + + + RoomInfoListItem + + + Leave room + + + + + Accept + + + + + Decline + + + + + SideBarActions + + + User settings + + + + + Create new room + + + + + Join a room + + + + + Start a new chat + + + + + Room directory + + + + + StatusIndicator + + + Encrypted + + + + + Delivered + + + + + Seen + + + + + Sent + + + + + TextInputWidget + + + Send a file + + + + + + Write a message... + + + + + Send a message + + + + + Emoji + + + + + Select a file + + + + + All Files (*) + + + + + Connection lost. Nheko is trying to re-connect... + + + + + TimelineItem + + + Message redaction failed: %1 + + + + + Reply + + + + + Options + + + + + TimelineView + + + Encryption is enabled + + + + + TopRoomBar + + + Room options + + + + + Invite users + + + + + Members + + + + + Leave room + + + + + Settings + + + + + TrayIcon + + + Show + + + + + Quit + + + + + TypingDisplay + + + is typing + + + + + are typing + + + + + UserInfoWidget + + + Logout + + + + + UserSettingsPage + + + Minimize to tray + + + + + Start in tray + + + + + Group's sidebar + + + + + Typing notifications + + + + + Read receipts + + + + + Desktop notifications + + + + + Scale factor + + + + + Font size + + + + + Font Family + + + + + Theme + + + + + Device ID + + + + + Device Fingerprint + + + + + Session Keys + + + + + IMPORT + + + + + EXPORT + + + + + ENCRYPTION + + + + + GENERAL + + + + + Open Sessions File + + + + + + + + + + + + + + Error + + + + + + File Password + + + + + Enter the passphrase to decrypt the file: + + + + + + The password cannot be empty + + + + + Enter passphrase to encrypt your session keys: + + + + + File to save the exported session keys + + + + + WelcomePage + + + Welcome to nheko! The desktop client for the Matrix protocol. + + + + + Enjoy your stay! + + + + + REGISTER + + + + + LOGIN + + + + + dialogs::CreateRoom + + + Create room + + + + + Cancel + + + + + Name + + + + + Topic + + + + + Alias + + + + + Room Visibility + + + + + Room Preset + + + + + Direct Chat + + + + + dialogs::InviteUsers + + + Cancel + + + + + User ID to invite + + + + + dialogs::JoinRoom + + + Join + + + + + Cancel + + + + + Room ID or alias + + + + + dialogs::LeaveRoom + + + Cancel + + + + + Are you sure you want to leave? + + + + + dialogs::Logout + + + Cancel + + + + + Logout. Are you sure? + + + + + dialogs::PreviewUploadOverlay + + + Upload + + + + + Cancel + + + + + Media type: %1 +Media size: %2 + + + + + + dialogs::ReCaptcha + + + Cancel + + + + + Confirm + + + + + Solve the reCAPTCHA and press the confirm button + + + + + dialogs::ReadReceipts + + + Read receipts + + + + + Close + + + + + ESC + + + + + dialogs::RoomSettings + + + Settings + + + + + Info + + + + + Internal ID + + + + + Room Version + + + + + Notifications + + + + + Muted + + + + + Mentions only + + + + + All messages + + + + + Room access + + + + + Anyone and guests + + + + + Anyone + + + + + Invited users + + + + + Encryption + + + + + End-to-End Encryption + + + + + Encryption is currently experimental and things might break unexpectedly. <br>Please take note that it can't be disabled afterwards. + + + + + Respond to key requests + + + + + Whether or not the client should respond automatically with the session keys + upon request. Use with caution, this is a temporary measure to test the + E2E implementation until device verification is completed. + + + + + %n member(s) + + + + + + + + ESC + + + + + Failed to enable encryption: %1 + + + + + Select an avatar + + + + + All Files (*) + + + + + The selected media is not an image + + + + + Error while reading media: %1 + + + + + + Failed to upload image: %s + + + + + dialogs::UserProfile + + + Ban the user from the room + + + + + Ignore messages from this user + + + + + Kick the user from the room + + + + + Start a conversation + + + + + Devices + + + + + ESC + + + + + emoji::Panel + + + Smileys & People + + + + + Animals & Nature + + + + + Food & Drink + + + + + Activity + + + + + Travel & Places + + + + + Objects + + + + + Symbols + + + + + Flags + + + + -- cgit 1.5.1 From 047966a069558f086e1b99a83df4dab6bd9ae24a Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 28 Jul 2019 10:05:13 +0000 Subject: Translated using Weblate (German) Currently translated at 37.4% (65 of 174 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/de/ --- resources/langs/nheko_de.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 5e0c7e2e..f592a4d8 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -6,7 +6,7 @@ Save File - Datei speichern + In Datei speichern @@ -34,7 +34,7 @@ Failed to restore OLM account. Please login again. - + Wiederherstellung des OLM Accounts fehlgeschlagen. Bitte logge dich erneut ein. @@ -44,7 +44,7 @@ Failed to setup encryption keys. Server response: %1 %2. Please try again later. - + Erstellung des Schlüsselmaterials fehlgeschlagen. Antwort des Servers: %1 %2. Bitte versuche es später erneut. @@ -68,23 +68,23 @@ All rooms - + Alle Räume Favourite rooms - + Favoriten Low priority rooms - + Unwichtige Räume (tag) - + (tag) -- cgit 1.5.1 From 1c9cc33902d8242ec25b4416a1662ee6c9902583 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 28 Jul 2019 12:50:10 +0200 Subject: Try to localise timestamps I'm not sure, if that is the right way, but Qt doesn't really have a way to format custom localised dates, so I tried to find the closest approximations to what we currently have. Relates to #69 --- resources/langs/nheko_de.ts | 101 +++++++++++++++++++++++++++++++--------- resources/langs/nheko_el.ts | 101 +++++++++++++++++++++++++++++++--------- resources/langs/nheko_en.ts | 101 +++++++++++++++++++++++++++++++--------- resources/langs/nheko_fr.ts | 101 +++++++++++++++++++++++++++++++--------- resources/langs/nheko_nl.ts | 101 +++++++++++++++++++++++++++++++--------- resources/langs/nheko_pl.ts | 101 +++++++++++++++++++++++++++++++--------- resources/langs/nheko_ru.ts | 103 ++++++++++++++++++++++++++++++++--------- resources/langs/nheko_zh_CN.ts | 101 +++++++++++++++++++++++++++++++--------- src/Utils.cpp | 20 ++++---- src/dialogs/MemberList.cpp | 4 +- src/dialogs/ReadReceipts.cpp | 12 +++-- src/timeline/TimelineItem.cpp | 2 +- src/ui/InfoMessage.cpp | 13 +++--- 13 files changed, 668 insertions(+), 193 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index f592a4d8..8c92c084 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -4,7 +4,7 @@ AudioItem - + Save File In Datei speichern @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. Hochladen der Bilddatei fehlgeschlagen. Bitte versuche es erneut. @@ -32,7 +32,7 @@ Hochladen der Videodatei fehlgeschlagen. Bitte versuche es erneut. - + Failed to restore OLM account. Please login again. Wiederherstellung des OLM Accounts fehlgeschlagen. Bitte logge dich erneut ein. @@ -42,7 +42,7 @@ Nachrichten konnten nicht aus dem Cache geladen werden. Bitte melde dich erneut an. - + Failed to setup encryption keys. Server response: %1 %2. Please try again later. Erstellung des Schlüsselmaterials fehlgeschlagen. Antwort des Servers: %1 %2. Bitte versuche es später erneut. @@ -118,7 +118,7 @@ FileItem - + Save File Datei speichern @@ -126,7 +126,7 @@ ImageItem - + Save image Bild speichern @@ -205,8 +205,8 @@ Teilnehmerliste - - ESC + + OK @@ -277,7 +277,7 @@ RoomInfo - + no version stored @@ -285,12 +285,12 @@ RoomInfoListItem - + Leave room Raum verlassen - + Accept Akzeptieren @@ -331,7 +331,7 @@ StatusIndicator - + Encrypted @@ -354,13 +354,13 @@ TextInputWidget - + Send a file - + Write a message... Schreibe eine Nachricht... @@ -424,7 +424,12 @@ - + + Mentions + + + + Invite users Benutzer einladen @@ -460,7 +465,7 @@ TypingDisplay - + is typing tippt @@ -481,7 +486,7 @@ UserSettingsPage - + Minimize to tray Ins Benachrichtigungsfeld minimieren @@ -521,12 +526,17 @@ - + Font Family - + + Emoji Font Famly + + + + Theme Erscheinungsbild @@ -566,7 +576,7 @@ ALLGEMEINES - + Open Sessions File @@ -635,6 +645,14 @@ ANMELDEN + + descriptiveTime + + + Yesterday + + + dialogs::CreateRoom @@ -778,7 +796,7 @@ Medien-Größe: %2 dialogs::ReadReceipts - + Read receipts Lesebestätigungen @@ -793,6 +811,19 @@ Medien-Größe: %2 + + dialogs::ReceiptItem + + + Today %1 + + + + + Yesterday %1 + + + dialogs::RoomSettings @@ -1003,4 +1034,32 @@ Medien-Größe: %2 Flaggen + + utils + + + You + + + + + sent a file. + + + + + sent an image. + + + + + sent an audio file. + + + + + sent a video + + + diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index 5a6be4cb..74b14266 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -4,7 +4,7 @@ AudioItem - + Save File Αποθήκευση @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. @@ -32,7 +32,7 @@ - + Failed to restore OLM account. Please login again. @@ -42,7 +42,7 @@ - + Failed to setup encryption keys. Server response: %1 %2. Please try again later. @@ -118,7 +118,7 @@ FileItem - + Save File Αποθήκευση @@ -126,7 +126,7 @@ ImageItem - + Save image Αποθήκευση Εικόνας @@ -205,8 +205,8 @@ Μέλη - - ESC + + OK @@ -277,7 +277,7 @@ RoomInfo - + no version stored @@ -285,12 +285,12 @@ RoomInfoListItem - + Leave room Βγές - + Accept Αποδοχή @@ -331,7 +331,7 @@ StatusIndicator - + Encrypted @@ -354,13 +354,13 @@ TextInputWidget - + Send a file - + Write a message... Γράψε ένα μήνυμα... @@ -424,7 +424,12 @@ - + + Mentions + + + + Invite users Προσκάλεσε χρήστες @@ -460,7 +465,7 @@ TypingDisplay - + is typing πληκτρολογεί @@ -481,7 +486,7 @@ UserSettingsPage - + Minimize to tray Ελαχιστοποίηση @@ -521,12 +526,17 @@ - + Font Family - + + Emoji Font Famly + + + + Theme Φόντο @@ -566,7 +576,7 @@ ΓΕΝΙΚΑ - + Open Sessions File @@ -635,6 +645,14 @@ ΕΙΣΟΔΟΣ + + descriptiveTime + + + Yesterday + + + dialogs::CreateRoom @@ -776,7 +794,7 @@ Media size: %2 dialogs::ReadReceipts - + Read receipts @@ -791,6 +809,19 @@ Media size: %2 + + dialogs::ReceiptItem + + + Today %1 + + + + + Yesterday %1 + + + dialogs::RoomSettings @@ -1001,4 +1032,32 @@ Media size: %2 Σημαίες + + utils + + + You + + + + + sent a file. + + + + + sent an image. + + + + + sent an audio file. + + + + + sent a video + + + diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index d8259dc5..5c4bad0e 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -4,7 +4,7 @@ AudioItem - + Save File Save File @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. Failed to upload image. Please try again. @@ -32,7 +32,7 @@ Failed to upload video. Please try again. - + Failed to restore OLM account. Please login again. Failed to restore OLM account. Please login again. @@ -42,7 +42,7 @@ Failed to restore save data. Please login again. - + Failed to setup encryption keys. Server response: %1 %2. Please try again later. Failed to setup encryption keys. Server response: %1 %2. Please try again later. @@ -118,7 +118,7 @@ FileItem - + Save File Save File @@ -126,7 +126,7 @@ ImageItem - + Save image Save image @@ -205,8 +205,8 @@ Room members - - ESC + + OK @@ -277,7 +277,7 @@ RoomInfo - + no version stored no version stored @@ -285,12 +285,12 @@ RoomInfoListItem - + Leave room Leave room - + Accept Accept @@ -331,7 +331,7 @@ StatusIndicator - + Encrypted @@ -354,13 +354,13 @@ TextInputWidget - + Send a file - + Write a message... @@ -424,7 +424,12 @@ - + + Mentions + + + + Invite users @@ -460,7 +465,7 @@ TypingDisplay - + is typing @@ -481,7 +486,7 @@ UserSettingsPage - + Minimize to tray @@ -521,12 +526,17 @@ - + Font Family - + + Emoji Font Famly + + + + Theme @@ -566,7 +576,7 @@ - + Open Sessions File @@ -635,6 +645,14 @@ + + descriptiveTime + + + Yesterday + + + dialogs::CreateRoom @@ -776,7 +794,7 @@ Media size: %2 dialogs::ReadReceipts - + Read receipts @@ -791,6 +809,19 @@ Media size: %2 + + dialogs::ReceiptItem + + + Today %1 + + + + + Yesterday %1 + + + dialogs::RoomSettings @@ -1001,4 +1032,32 @@ Media size: %2 Flags + + utils + + + You + + + + + sent a file. + + + + + sent an image. + + + + + sent an audio file. + + + + + sent a video + + + diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index beab8752..f8425e26 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -4,7 +4,7 @@ AudioItem - + Save File Enregistrer le fichier @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. @@ -32,7 +32,7 @@ - + Failed to restore OLM account. Please login again. @@ -42,7 +42,7 @@ - + Failed to setup encryption keys. Server response: %1 %2. Please try again later. @@ -118,7 +118,7 @@ FileItem - + Save File Enregistrer le fichier @@ -126,7 +126,7 @@ ImageItem - + Save image Enregistrer l'image @@ -205,8 +205,8 @@ Membres du salon - - ESC + + OK @@ -278,7 +278,7 @@ RoomInfo - + no version stored @@ -286,12 +286,12 @@ RoomInfoListItem - + Leave room Quitter le salon - + Accept Accepter @@ -332,7 +332,7 @@ StatusIndicator - + Encrypted @@ -355,13 +355,13 @@ TextInputWidget - + Send a file - + Write a message... Écrivez un message... @@ -425,7 +425,12 @@ - + + Mentions + + + + Invite users Inviter des utilisateurs @@ -461,7 +466,7 @@ TypingDisplay - + is typing est en train d'écrire @@ -482,7 +487,7 @@ UserSettingsPage - + Minimize to tray Réduire à la barre des tâches @@ -522,12 +527,17 @@ - + Font Family - + + Emoji Font Famly + + + + Theme Thème @@ -567,7 +577,7 @@ GÉNÉRAL - + Open Sessions File @@ -636,6 +646,14 @@ CONNEXION + + descriptiveTime + + + Yesterday + + + dialogs::CreateRoom @@ -779,7 +797,7 @@ Taille du média : %2 dialogs::ReadReceipts - + Read receipts Accusés de lecture @@ -794,6 +812,19 @@ Taille du média : %2 + + dialogs::ReceiptItem + + + Today %1 + + + + + Yesterday %1 + + + dialogs::RoomSettings @@ -1004,4 +1035,32 @@ Taille du média : %2 Drapeaux + + utils + + + You + + + + + sent a file. + + + + + sent an image. + + + + + sent an audio file. + + + + + sent a video + + + diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index 4c81ec76..51ec18fe 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -4,7 +4,7 @@ AudioItem - + Save File Bestand opslaan @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. @@ -32,7 +32,7 @@ - + Failed to restore OLM account. Please login again. @@ -42,7 +42,7 @@ - + Failed to setup encryption keys. Server response: %1 %2. Please try again later. @@ -118,7 +118,7 @@ FileItem - + Save File Bestand opslaan @@ -126,7 +126,7 @@ ImageItem - + Save image Afbeelding opslaan @@ -205,8 +205,8 @@ Kamerleden - - ESC + + OK @@ -277,7 +277,7 @@ RoomInfo - + no version stored @@ -285,12 +285,12 @@ RoomInfoListItem - + Leave room Kamer verlaten - + Accept Accepteren @@ -331,7 +331,7 @@ StatusIndicator - + Encrypted @@ -354,13 +354,13 @@ TextInputWidget - + Send a file - + Write a message... Typ een bericht... @@ -424,7 +424,12 @@ - + + Mentions + + + + Invite users Gebruikers uitnodigen @@ -460,7 +465,7 @@ TypingDisplay - + is typing is aan het typen @@ -481,7 +486,7 @@ UserSettingsPage - + Minimize to tray Minimaliseren naar systeemvak @@ -521,12 +526,17 @@ - + Font Family - + + Emoji Font Famly + + + + Theme Thema @@ -566,7 +576,7 @@ ALGEMEEN - + Open Sessions File @@ -635,6 +645,14 @@ INLOGGEN + + descriptiveTime + + + Yesterday + + + dialogs::CreateRoom @@ -778,7 +796,7 @@ Mediagrootte: %2 dialogs::ReadReceipts - + Read receipts Leesbevestigingen @@ -793,6 +811,19 @@ Mediagrootte: %2 + + dialogs::ReceiptItem + + + Today %1 + + + + + Yesterday %1 + + + dialogs::RoomSettings @@ -1003,4 +1034,32 @@ Mediagrootte: %2 Vlaggen + + utils + + + You + + + + + sent a file. + + + + + sent an image. + + + + + sent an audio file. + + + + + sent a video + + + diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index edea85b9..ca021554 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -4,7 +4,7 @@ AudioItem - + Save File Zapisz plik @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. Nie udało się wysłać obrazu. Spróbuj ponownie. @@ -32,7 +32,7 @@ Nie udało się wysłać filmu. Spróbuj ponownie. - + Failed to restore OLM account. Please login again. Nie udało się przywrócić konta OLM. Spróbuj zalogować się ponownie. @@ -42,7 +42,7 @@ Nie udało się przywrócić zapisanych danych. Spróbuj zalogować się ponownie. - + Failed to setup encryption keys. Server response: %1 %2. Please try again later. @@ -118,7 +118,7 @@ FileItem - + Save File Zapisz plik @@ -126,7 +126,7 @@ ImageItem - + Save image Zapisz obraz @@ -205,8 +205,8 @@ Członkowie pokoju - - ESC + + OK @@ -277,7 +277,7 @@ RoomInfo - + no version stored @@ -285,12 +285,12 @@ RoomInfoListItem - + Leave room Opuść pokój - + Accept Akceptuj @@ -331,7 +331,7 @@ StatusIndicator - + Encrypted Szyfrowana @@ -354,13 +354,13 @@ TextInputWidget - + Send a file Wyślij plik - + Write a message... Napisz wiadomość… @@ -424,7 +424,12 @@ Ustawienia pokoju - + + Mentions + + + + Invite users Zaproś użytkowników @@ -460,7 +465,7 @@ TypingDisplay - + is typing pisze @@ -481,7 +486,7 @@ UserSettingsPage - + Minimize to tray Zminimalizuj do paska zadań @@ -521,12 +526,17 @@ - + Font Family - + + Emoji Font Famly + + + + Theme Motyw @@ -566,7 +576,7 @@ OGÓLNE - + Open Sessions File @@ -635,6 +645,14 @@ ZALOGUJ SIĘ + + descriptiveTime + + + Yesterday + + + dialogs::CreateRoom @@ -778,7 +796,7 @@ Rozmiar multimediów: %2 dialogs::ReadReceipts - + Read receipts Potwierdzenia przeczytania @@ -793,6 +811,19 @@ Rozmiar multimediów: %2 + + dialogs::ReceiptItem + + + Today %1 + + + + + Yesterday %1 + + + dialogs::RoomSettings @@ -1006,4 +1037,32 @@ Rozmiar multimediów: %2 Flagi + + utils + + + You + + + + + sent a file. + + + + + sent an image. + + + + + sent an audio file. + + + + + sent a video + + + diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index 4c157884..39cf7b72 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -4,7 +4,7 @@ AudioItem - + Save File Сохранить файл @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. Не удалось загрузить изображение. Пожалуйста, попробуйте еще раз. @@ -32,7 +32,7 @@ Не удалось загрузить видео. Пожалуйста, попробуйте еще раз. - + Failed to restore OLM account. Please login again. Не удалось восстановить учетную запись OLM. Пожалуйста, войдите снова. @@ -42,7 +42,7 @@ Не удалось восстановить сохраненные данные. Пожалуйста, войдите снова. - + Failed to setup encryption keys. Server response: %1 %2. Please try again later. Не удалось настроить ключи шифрования. Ответ сервера:%1 %2. Пожалуйста, попробуйте позже. @@ -118,7 +118,7 @@ FileItem - + Save File Сохранить файл @@ -126,7 +126,7 @@ ImageItem - + Save image Сохранить изображение @@ -205,9 +205,9 @@ Участники комнаты - - ESC - + + OK + @@ -277,7 +277,7 @@ RoomInfo - + no version stored @@ -285,12 +285,12 @@ RoomInfoListItem - + Leave room Покинуть комнату - + Accept Принять @@ -331,7 +331,7 @@ StatusIndicator - + Encrypted Зашифровано @@ -354,13 +354,13 @@ TextInputWidget - + Send a file Отправить файл - + Write a message... Написать сообщение... @@ -424,7 +424,12 @@ Настройки комнаты - + + Mentions + + + + Invite users Пригласить пользователей @@ -460,7 +465,7 @@ TypingDisplay - + is typing печатает @@ -481,7 +486,7 @@ UserSettingsPage - + Minimize to tray Сворачивать в системную панель @@ -521,12 +526,17 @@ Размер шрифта - + Font Family - + + Emoji Font Famly + + + + Theme Тема @@ -566,7 +576,7 @@ ГЛАВНОЕ - + Open Sessions File Открыть файл сеансов @@ -636,6 +646,14 @@ ВХОД + + descriptiveTime + + + Yesterday + + + dialogs::CreateRoom @@ -779,7 +797,7 @@ Media size: %2 dialogs::ReadReceipts - + Read receipts Подтверждать прочтение @@ -794,6 +812,19 @@ Media size: %2 + + dialogs::ReceiptItem + + + Today %1 + + + + + Yesterday %1 + + + dialogs::RoomSettings @@ -1005,4 +1036,32 @@ Media size: %2 + + utils + + + You + + + + + sent a file. + + + + + sent an image. + + + + + sent an audio file. + + + + + sent a video + + + diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index ca7c6e22..08463cd7 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -4,7 +4,7 @@ AudioItem - + Save File 保存文件 @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. 上传图像失败。请重试。 @@ -32,7 +32,7 @@ 上传视频失败。请重试。 - + Failed to restore OLM account. Please login again. 恢复 OLM 账户失败。请重新登录。 @@ -42,7 +42,7 @@ 恢复保存的数据失败。请重新登录。 - + Failed to setup encryption keys. Server response: %1 %2. Please try again later. @@ -118,7 +118,7 @@ FileItem - + Save File 保存文件 @@ -126,7 +126,7 @@ ImageItem - + Save image 保存图像 @@ -205,8 +205,8 @@ 聊天室成员 - - ESC + + OK @@ -277,7 +277,7 @@ RoomInfo - + no version stored @@ -285,12 +285,12 @@ RoomInfoListItem - + Leave room 离开聊天室 - + Accept 接受 @@ -331,7 +331,7 @@ StatusIndicator - + Encrypted 加密的 @@ -354,13 +354,13 @@ TextInputWidget - + Send a file 发送一个文件 - + Write a message... 写一条消息... @@ -424,7 +424,12 @@ 聊天室选项 - + + Mentions + + + + Invite users 邀请用户 @@ -460,7 +465,7 @@ TypingDisplay - + is typing 正在打字 @@ -481,7 +486,7 @@ UserSettingsPage - + Minimize to tray 最小化至托盘 @@ -521,12 +526,17 @@ - + Font Family - + + Emoji Font Famly + + + + Theme 主题 @@ -566,7 +576,7 @@ 通用 - + Open Sessions File 打开会话文件 @@ -635,6 +645,14 @@ 登录 + + descriptiveTime + + + Yesterday + + + dialogs::CreateRoom @@ -778,7 +796,7 @@ Media size: %2 dialogs::ReadReceipts - + Read receipts 阅读回执 @@ -793,6 +811,19 @@ Media size: %2 + + dialogs::ReceiptItem + + + Today %1 + + + + + Yesterday %1 + + + dialogs::RoomSettings @@ -1012,4 +1043,32 @@ Media size: %2 Flags + + utils + + + You + + + + + sent a file. + + + + + sent an image. + + + + + sent an audio file. + + + + + sent a video + + + diff --git a/src/Utils.cpp b/src/Utils.cpp index d6b092b1..a3c15c96 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -99,13 +99,13 @@ utils::descriptiveTime(const QDateTime &then) const auto days = then.daysTo(now); if (days == 0) - return then.toString("HH:mm"); + return then.time().toString(Qt::DefaultLocaleShortDate); else if (days < 2) - return QString("Yesterday"); - else if (days < 365) - return then.toString("dd/MM"); + return QString(QCoreApplication::translate("descriptiveTime", "Yesterday")); + else if (days < 7) + return then.toString("dddd"); - return then.toString("dd/MM/yy"); + return then.date().toString(Qt::DefaultLocaleShortDate); } DescInfo @@ -147,7 +147,7 @@ utils::getMessageDescription(const TimelineEvent &event, DescInfo info; if (sender == localUser) - info.username = "You"; + info.username = QCoreApplication::translate("utils", "You"); else info.username = username; @@ -366,16 +366,16 @@ utils::getQuoteBody(const RelatedInfo &related) return markdownToHtml(related.quoted_body); } case MsgType::File: { - return QString("sent a file."); + return QString(QCoreApplication::translate("utils", "sent a file.")); } case MsgType::Image: { - return QString("sent an image."); + return QString(QCoreApplication::translate("utils", "sent an image.")); } case MsgType::Audio: { - return QString("sent an audio file."); + return QString(QCoreApplication::translate("utils", "sent an audio file.")); } case MsgType::Video: { - return QString("sent a video"); + return QString(QCoreApplication::translate("utils", "sent a video")); } default: { return related.quoted_body; diff --git a/src/dialogs/MemberList.cpp b/src/dialogs/MemberList.cpp index f4167143..3b957c15 100644 --- a/src/dialogs/MemberList.cpp +++ b/src/dialogs/MemberList.cpp @@ -97,7 +97,7 @@ MemberList::MemberList(const QString &room_id, QWidget *parent) topLabel_->setAlignment(Qt::AlignCenter); topLabel_->setFont(font); - auto okBtn = new QPushButton("OK", this); + auto okBtn = new QPushButton(tr("OK"), this); auto buttonLayout = new QHBoxLayout(); buttonLayout->setSpacing(15); @@ -126,7 +126,7 @@ MemberList::MemberList(const QString &room_id, QWidget *parent) qCritical() << e.what(); } - auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this); + auto closeShortcut = new QShortcut(QKeySequence("ESC"), this); connect(closeShortcut, &QShortcut::activated, this, &MemberList::close); connect(okBtn, &QPushButton::clicked, this, &MemberList::close); } diff --git a/src/dialogs/ReadReceipts.cpp b/src/dialogs/ReadReceipts.cpp index dc4145db..03ce3068 100644 --- a/src/dialogs/ReadReceipts.cpp +++ b/src/dialogs/ReadReceipts.cpp @@ -78,13 +78,15 @@ ReceiptItem::dateFormat(const QDateTime &then) const auto days = then.daysTo(now); if (days == 0) - return QString("Today %1").arg(then.toString("HH:mm")); + return tr("Today %1").arg(then.time().toString(Qt::DefaultLocaleShortDate)); else if (days < 2) - return QString("Yesterday %1").arg(then.toString("HH:mm")); - else if (days < 365) - return then.toString("dd/MM HH:mm"); + return tr("Yesterday %1").arg(then.time().toString(Qt::DefaultLocaleShortDate)); + else if (days < 7) + return QString("%1 %2") + .arg(then.toString("dddd")) + .arg(then.time().toString(Qt::DefaultLocaleShortDate)); - return then.toString("dd/MM/yy"); + return then.toString(Qt::DefaultLocaleShortDate); } ReadReceipts::ReadReceipts(QWidget *parent) diff --git a/src/timeline/TimelineItem.cpp b/src/timeline/TimelineItem.cpp index e52dce7b..c0d7f97f 100644 --- a/src/timeline/TimelineItem.cpp +++ b/src/timeline/TimelineItem.cpp @@ -951,4 +951,4 @@ TimelineItem::openRawMessageViewer() const "failed to serialize event ({}, {})", room_id, event_id); } }); -} \ No newline at end of file +} diff --git a/src/ui/InfoMessage.cpp b/src/ui/InfoMessage.cpp index fa575d76..27bc0a5f 100644 --- a/src/ui/InfoMessage.cpp +++ b/src/ui/InfoMessage.cpp @@ -2,6 +2,7 @@ #include "Config.h" #include +#include #include #include #include @@ -61,14 +62,14 @@ DateSeparator::DateSeparator(QDateTime datetime, QWidget *parent) { auto now = QDateTime::currentDateTime(); - QString fmt; + QString fmt = QLocale::system().dateFormat(QLocale::LongFormat); - if (now.date().year() != datetime.date().year()) - fmt = QString("ddd d MMMM yy"); - else - fmt = QString("ddd d MMMM"); + if (now.date().year() == datetime.date().year()) { + QRegularExpression rx("[^a-zA-Z]*y+[^a-zA-Z]*"); + fmt = fmt.remove(rx); + } - msg_ = datetime.toString(fmt); + msg_ = datetime.date().toString(fmt); QFontMetrics fm{font()}; #if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) -- cgit 1.5.1 From 0f8d882aaff74f62fe394cbe5a5486524752f0dc Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 28 Jul 2019 12:56:16 +0200 Subject: Fix newly added languages after timestamp localization --- resources/langs/nheko_en.ts | 26 ++++++------ resources/langs/nheko_fi.ts | 101 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 93 insertions(+), 34 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 5c4bad0e..a180645d 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -441,7 +441,7 @@ Leave room - + Leave room @@ -480,7 +480,7 @@ Logout - + Logout @@ -637,12 +637,12 @@ REGISTER - + REGISTER LOGIN - + LOGIN @@ -663,17 +663,17 @@ Cancel - + Cancel Name - + Name Topic - + Topic @@ -701,7 +701,7 @@ Cancel - + Cancel @@ -719,7 +719,7 @@ Cancel - + Cancel @@ -732,7 +732,7 @@ Cancel - + Cancel @@ -745,7 +745,7 @@ Cancel - + Cancel @@ -763,7 +763,7 @@ Cancel - + Cancel @@ -778,7 +778,7 @@ Media size: %2 Cancel - + Cancel diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index e257f9d8..a81c0256 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -4,7 +4,7 @@ AudioItem - + Save File @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. @@ -32,7 +32,7 @@ - + Failed to restore OLM account. Please login again. @@ -42,7 +42,7 @@ - + Failed to setup encryption keys. Server response: %1 %2. Please try again later. @@ -118,7 +118,7 @@ FileItem - + Save File @@ -126,7 +126,7 @@ ImageItem - + Save image @@ -205,8 +205,8 @@ - - ESC + + OK @@ -277,7 +277,7 @@ RoomInfo - + no version stored @@ -285,12 +285,12 @@ RoomInfoListItem - + Leave room - + Accept @@ -331,7 +331,7 @@ StatusIndicator - + Encrypted @@ -354,13 +354,13 @@ TextInputWidget - + Send a file - + Write a message... @@ -424,7 +424,12 @@ - + + Mentions + + + + Invite users @@ -460,7 +465,7 @@ TypingDisplay - + is typing @@ -481,7 +486,7 @@ UserSettingsPage - + Minimize to tray @@ -521,12 +526,17 @@ - + Font Family - + + Emoji Font Famly + + + + Theme @@ -566,7 +576,7 @@ - + Open Sessions File @@ -635,6 +645,14 @@ + + descriptiveTime + + + Yesterday + + + dialogs::CreateRoom @@ -776,7 +794,7 @@ Media size: %2 dialogs::ReadReceipts - + Read receipts @@ -791,6 +809,19 @@ Media size: %2 + + dialogs::ReceiptItem + + + Today %1 + + + + + Yesterday %1 + + + dialogs::RoomSettings @@ -1001,4 +1032,32 @@ Media size: %2 + + utils + + + You + + + + + sent a file. + + + + + sent an image. + + + + + sent an audio file. + + + + + sent a video + + + -- cgit 1.5.1 From 50c3d4ed3a355d1ec9209b27ae60085d56a8ce98 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 28 Jul 2019 13:16:13 +0200 Subject: Add decryption error messages to translations --- resources/langs/nheko_de.ts | 30 ++++++++++++++++++++++++++++++ resources/langs/nheko_el.ts | 30 ++++++++++++++++++++++++++++++ resources/langs/nheko_en.ts | 30 ++++++++++++++++++++++++++++++ resources/langs/nheko_fi.ts | 30 ++++++++++++++++++++++++++++++ resources/langs/nheko_fr.ts | 30 ++++++++++++++++++++++++++++++ resources/langs/nheko_nl.ts | 30 ++++++++++++++++++++++++++++++ resources/langs/nheko_pl.ts | 30 ++++++++++++++++++++++++++++++ resources/langs/nheko_ru.ts | 30 ++++++++++++++++++++++++++++++ resources/langs/nheko_zh_CN.ts | 30 ++++++++++++++++++++++++++++++ src/timeline/TimelineView.cpp | 28 +++++++++++++++++++++++----- 10 files changed, 293 insertions(+), 5 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 8c92c084..a3acae8e 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -415,6 +415,36 @@ Encryption is enabled + + + -- Encrypted Event (No keys found for decryption) -- + Placeholder, when the message was not decrypted yet or can't be decrypted + + + + + -- Decryption Error (failed to communicate with DB) -- + Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. + + + + + -- Decryption Error (failed to retrieve megolm keys from db) -- + Placeholder, when the message can't be decrypted, because the DB access failed. + + + + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 + + + + + -- Encrypted Event (Unknown event type) -- + Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet + + TopRoomBar diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index 74b14266..462f523e 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -415,6 +415,36 @@ Encryption is enabled + + + -- Encrypted Event (No keys found for decryption) -- + Placeholder, when the message was not decrypted yet or can't be decrypted + + + + + -- Decryption Error (failed to communicate with DB) -- + Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. + + + + + -- Decryption Error (failed to retrieve megolm keys from db) -- + Placeholder, when the message can't be decrypted, because the DB access failed. + + + + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 + + + + + -- Encrypted Event (Unknown event type) -- + Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet + + TopRoomBar diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index a180645d..afd4c815 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -415,6 +415,36 @@ Encryption is enabled + + + -- Encrypted Event (No keys found for decryption) -- + Placeholder, when the message was not decrypted yet or can't be decrypted + + + + + -- Decryption Error (failed to communicate with DB) -- + Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. + + + + + -- Decryption Error (failed to retrieve megolm keys from db) -- + Placeholder, when the message can't be decrypted, because the DB access failed. + + + + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 + + + + + -- Encrypted Event (Unknown event type) -- + Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet + + TopRoomBar diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index a81c0256..789a4ebd 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -415,6 +415,36 @@ Encryption is enabled + + + -- Encrypted Event (No keys found for decryption) -- + Placeholder, when the message was not decrypted yet or can't be decrypted + + + + + -- Decryption Error (failed to communicate with DB) -- + Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. + + + + + -- Decryption Error (failed to retrieve megolm keys from db) -- + Placeholder, when the message can't be decrypted, because the DB access failed. + + + + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 + + + + + -- Encrypted Event (Unknown event type) -- + Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet + + TopRoomBar diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index f8425e26..b8c0d6d9 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -416,6 +416,36 @@ Encryption is enabled + + + -- Encrypted Event (No keys found for decryption) -- + Placeholder, when the message was not decrypted yet or can't be decrypted + + + + + -- Decryption Error (failed to communicate with DB) -- + Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. + + + + + -- Decryption Error (failed to retrieve megolm keys from db) -- + Placeholder, when the message can't be decrypted, because the DB access failed. + + + + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 + + + + + -- Encrypted Event (Unknown event type) -- + Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet + + TopRoomBar diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index 51ec18fe..b1be0135 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -415,6 +415,36 @@ Encryption is enabled + + + -- Encrypted Event (No keys found for decryption) -- + Placeholder, when the message was not decrypted yet or can't be decrypted + + + + + -- Decryption Error (failed to communicate with DB) -- + Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. + + + + + -- Decryption Error (failed to retrieve megolm keys from db) -- + Placeholder, when the message can't be decrypted, because the DB access failed. + + + + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 + + + + + -- Encrypted Event (Unknown event type) -- + Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet + + TopRoomBar diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index ca021554..2f7c903c 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -415,6 +415,36 @@ Encryption is enabled Szyfrowanie jest włączone + + + -- Encrypted Event (No keys found for decryption) -- + Placeholder, when the message was not decrypted yet or can't be decrypted + + + + + -- Decryption Error (failed to communicate with DB) -- + Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. + + + + + -- Decryption Error (failed to retrieve megolm keys from db) -- + Placeholder, when the message can't be decrypted, because the DB access failed. + + + + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 + + + + + -- Encrypted Event (Unknown event type) -- + Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet + + TopRoomBar diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index 39cf7b72..097067db 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -415,6 +415,36 @@ Encryption is enabled Шифрование включено + + + -- Encrypted Event (No keys found for decryption) -- + Placeholder, when the message was not decrypted yet or can't be decrypted + + + + + -- Decryption Error (failed to communicate with DB) -- + Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. + + + + + -- Decryption Error (failed to retrieve megolm keys from db) -- + Placeholder, when the message can't be decrypted, because the DB access failed. + + + + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 + + + + + -- Encrypted Event (Unknown event type) -- + Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet + + TopRoomBar diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index 08463cd7..2481f989 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -415,6 +415,36 @@ Encryption is enabled 加密已启用 + + + -- Encrypted Event (No keys found for decryption) -- + Placeholder, when the message was not decrypted yet or can't be decrypted + + + + + -- Decryption Error (failed to communicate with DB) -- + Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. + + + + + -- Decryption Error (failed to retrieve megolm keys from db) -- + Placeholder, when the message can't be decrypted, because the DB access failed. + + + + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 + + + + + -- Encrypted Event (Unknown event type) -- + Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet + + TopRoomBar diff --git a/src/timeline/TimelineView.cpp b/src/timeline/TimelineView.cpp index 18b73eb0..ed783e90 100644 --- a/src/timeline/TimelineView.cpp +++ b/src/timeline/TimelineView.cpp @@ -306,7 +306,10 @@ TimelineView::parseEncryptedEvent(const mtx::events::EncryptedEventinboundMegolmSessionExists(index)) { @@ -319,7 +322,10 @@ TimelineView::parseEncryptedEvent(const mtx::events::EncryptedEventcritical("failed to check megolm session's existence: {}", e.what()); - dummy.content.body = "-- Decryption Error (failed to communicate with DB) --"; + dummy.content.body = tr("-- Decryption Error (failed to communicate with DB) --", + "Placeholder, when the message can't be decrypted, because " + "the DB access failed when trying to lookup the session.") + .toStdString(); return {dummy, false}; } @@ -335,7 +341,10 @@ TimelineView::parseEncryptedEvent(const mtx::events::EncryptedEventcritical("failed to decrypt message with index ({}, {}, {}): {}", @@ -343,7 +352,12 @@ TimelineView::parseEncryptedEvent(const mtx::events::EncryptedEvent Date: Sun, 28 Jul 2019 16:16:02 +0200 Subject: media->file in error message, when image upload fails --- resources/langs/nheko_de.ts | 23 ++++------------------- resources/langs/nheko_el.ts | 23 ++++------------------- resources/langs/nheko_en.ts | 23 ++++------------------- resources/langs/nheko_fi.ts | 23 ++++------------------- resources/langs/nheko_fr.ts | 23 ++++------------------- resources/langs/nheko_nl.ts | 23 ++++------------------- resources/langs/nheko_pl.ts | 27 ++++++--------------------- resources/langs/nheko_ru.ts | 27 ++++++--------------------- resources/langs/nheko_zh_CN.ts | 27 ++++++--------------------- src/dialogs/MemberList.cpp | 2 +- src/dialogs/ReadReceipts.cpp | 2 +- src/dialogs/RoomSettings.cpp | 6 +++--- src/dialogs/UserProfile.cpp | 2 +- 13 files changed, 48 insertions(+), 183 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index a3acae8e..1f856b80 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -835,16 +835,11 @@ Medien-Größe: %2 Close - - - ESC - - dialogs::ReceiptItem - + Today %1 @@ -952,12 +947,7 @@ Medien-Größe: %2 - - ESC - - - - + Failed to enable encryption: %1 @@ -973,12 +963,12 @@ Medien-Größe: %2 - The selected media is not an image + The selected file is not an image - Error while reading media: %1 + Error while reading file: %1 @@ -1015,11 +1005,6 @@ Medien-Größe: %2 Devices - - - ESC - - emoji::Panel diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index 462f523e..e50aadad 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -833,16 +833,11 @@ Media size: %2 Close - - - ESC - - dialogs::ReceiptItem - + Today %1 @@ -950,12 +945,7 @@ Media size: %2 - - ESC - - - - + Failed to enable encryption: %1 @@ -971,12 +961,12 @@ Media size: %2 - The selected media is not an image + The selected file is not an image - Error while reading media: %1 + Error while reading file: %1 @@ -1013,11 +1003,6 @@ Media size: %2 Devices - - - ESC - - emoji::Panel diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index afd4c815..e031c4ec 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -833,16 +833,11 @@ Media size: %2 Close - - - ESC - - dialogs::ReceiptItem - + Today %1 @@ -950,12 +945,7 @@ Media size: %2 - - ESC - - - - + Failed to enable encryption: %1 @@ -971,12 +961,12 @@ Media size: %2 - The selected media is not an image + The selected file is not an image - Error while reading media: %1 + Error while reading file: %1 @@ -1013,11 +1003,6 @@ Media size: %2 Devices - - - ESC - - emoji::Panel diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index 789a4ebd..2baba55d 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -833,16 +833,11 @@ Media size: %2 Close - - - ESC - - dialogs::ReceiptItem - + Today %1 @@ -950,12 +945,7 @@ Media size: %2 - - ESC - - - - + Failed to enable encryption: %1 @@ -971,12 +961,12 @@ Media size: %2 - The selected media is not an image + The selected file is not an image - Error while reading media: %1 + Error while reading file: %1 @@ -1013,11 +1003,6 @@ Media size: %2 Devices - - - ESC - - emoji::Panel diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index b8c0d6d9..355c4325 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -836,16 +836,11 @@ Taille du média : %2 Close - - - ESC - - dialogs::ReceiptItem - + Today %1 @@ -953,12 +948,7 @@ Taille du média : %2 - - ESC - - - - + Failed to enable encryption: %1 @@ -974,12 +964,12 @@ Taille du média : %2 - The selected media is not an image + The selected file is not an image - Error while reading media: %1 + Error while reading file: %1 @@ -1016,11 +1006,6 @@ Taille du média : %2 Devices - - - ESC - - emoji::Panel diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index b1be0135..db56dc0f 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -835,16 +835,11 @@ Mediagrootte: %2 Close - - - ESC - - dialogs::ReceiptItem - + Today %1 @@ -952,12 +947,7 @@ Mediagrootte: %2 - - ESC - - - - + Failed to enable encryption: %1 @@ -973,12 +963,12 @@ Mediagrootte: %2 - The selected media is not an image + The selected file is not an image - Error while reading media: %1 + Error while reading file: %1 @@ -1015,11 +1005,6 @@ Mediagrootte: %2 Devices - - - ESC - - emoji::Panel diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index 2f7c903c..34a4ed26 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -835,16 +835,11 @@ Rozmiar multimediów: %2 Close - - - ESC - - dialogs::ReceiptItem - + Today %1 @@ -955,12 +950,7 @@ Rozmiar multimediów: %2 - - ESC - - - - + Failed to enable encryption: %1 Nie udało się włączyć szyfrowania: %1 @@ -976,13 +966,13 @@ Rozmiar multimediów: %2 - The selected media is not an image - Wybrany plik multimedialny nie jest obrazem + The selected file is not an image + - Error while reading media: %1 - Błąd odczytywania pliku: %1 + Error while reading file: %1 + @@ -1018,11 +1008,6 @@ Rozmiar multimediów: %2 Devices Urządzenia - - - ESC - - emoji::Panel diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index 097067db..afe36ef9 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -836,16 +836,11 @@ Media size: %2 Close Закрыть - - - ESC - - dialogs::ReceiptItem - + Today %1 @@ -954,12 +949,7 @@ Media size: %2 - - ESC - - - - + Failed to enable encryption: %1 Не удалось включить шифрование: %1 @@ -975,13 +965,13 @@ Media size: %2 - The selected media is not an image - Выбранное медия не является изображением + The selected file is not an image + - Error while reading media: %1 - Ошибка при чтении медия: %1 + Error while reading file: %1 + @@ -1017,11 +1007,6 @@ Media size: %2 Devices Устройства - - - ESC - - emoji::Panel diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index 2481f989..607b2ba9 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -835,16 +835,11 @@ Media size: %2 Close - - - ESC - - dialogs::ReceiptItem - + Today %1 @@ -953,12 +948,7 @@ Media size: %2 - - ESC - - - - + Failed to enable encryption: %1 启用加密失败：%1 @@ -974,13 +964,13 @@ Media size: %2 - The selected media is not an image - 选择的媒体不是一个图像 + The selected file is not an image + - Error while reading media: %1 - 读取媒体时失败：%1 + Error while reading file: %1 + @@ -1016,11 +1006,6 @@ Media size: %2 Devices 设备 - - - ESC - - emoji::Panel diff --git a/src/dialogs/MemberList.cpp b/src/dialogs/MemberList.cpp index 3b957c15..88a95403 100644 --- a/src/dialogs/MemberList.cpp +++ b/src/dialogs/MemberList.cpp @@ -126,7 +126,7 @@ MemberList::MemberList(const QString &room_id, QWidget *parent) qCritical() << e.what(); } - auto closeShortcut = new QShortcut(QKeySequence("ESC"), this); + auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this); connect(closeShortcut, &QShortcut::activated, this, &MemberList::close); connect(okBtn, &QPushButton::clicked, this, &MemberList::close); } diff --git a/src/dialogs/ReadReceipts.cpp b/src/dialogs/ReadReceipts.cpp index 03ce3068..5a0d98c7 100644 --- a/src/dialogs/ReadReceipts.cpp +++ b/src/dialogs/ReadReceipts.cpp @@ -133,7 +133,7 @@ ReadReceipts::ReadReceipts(QWidget *parent) layout->addWidget(userList_); layout->addLayout(buttonLayout); - auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this); + auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this); connect(closeShortcut, &QShortcut::activated, this, &ReadReceipts::close); connect(okBtn, &QPushButton::clicked, this, &ReadReceipts::close); } diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp index b2344f23..1fe5904b 100644 --- a/src/dialogs/RoomSettings.cpp +++ b/src/dialogs/RoomSettings.cpp @@ -438,7 +438,7 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent) resetErrorLabel(); }); - auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this); + auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this); connect(closeShortcut, &QShortcut::activated, this, &RoomSettings::close); connect(okBtn, &QPushButton::clicked, this, &RoomSettings::close); } @@ -668,12 +668,12 @@ RoomSettings::updateAvatar() QFile file{fileName, this}; if (format != "image") { - displayErrorMessage(tr("The selected media is not an image")); + displayErrorMessage(tr("The selected file is not an image")); return; } if (!file.open(QIODevice::ReadOnly)) { - displayErrorMessage(tr("Error while reading media: %1").arg(file.errorString())); + displayErrorMessage(tr("Error while reading file: %1").arg(file.errorString())); return; } diff --git a/src/dialogs/UserProfile.cpp b/src/dialogs/UserProfile.cpp index b8040f9f..6aea96a8 100644 --- a/src/dialogs/UserProfile.cpp +++ b/src/dialogs/UserProfile.cpp @@ -183,7 +183,7 @@ UserProfile::UserProfile(QWidget *parent) qRegisterMetaType>(); - auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this); + auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this); connect(closeShortcut, &QShortcut::activated, this, &UserProfile::close); connect(okBtn, &QPushButton::clicked, this, &UserProfile::close); } -- cgit 1.5.1 From 0398c846f6836b734bf3432696df1e04e86d8867 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 28 Jul 2019 18:13:16 +0200 Subject: Add 'and' to typing display --- resources/langs/nheko_de.ts | 17 ++++++++--------- resources/langs/nheko_el.ts | 17 ++++++++--------- resources/langs/nheko_en.ts | 17 ++++++++--------- resources/langs/nheko_fi.ts | 17 ++++++++--------- resources/langs/nheko_fr.ts | 17 ++++++++--------- resources/langs/nheko_nl.ts | 17 ++++++++--------- resources/langs/nheko_pl.ts | 18 +++++++++--------- resources/langs/nheko_ru.ts | 18 +++++++++--------- resources/langs/nheko_zh_CN.ts | 16 +++++++--------- src/TypingDisplay.cpp | 17 +++++++++++------ src/timeline/TimelineItem.h | 2 +- 11 files changed, 85 insertions(+), 88 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 1f856b80..80a50ae2 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -494,15 +494,14 @@ TypingDisplay - - - is typing - tippt - - - - are typing - tippen + + + %1 and %2 are typing + Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.) + + %1%2 tippt + %1 und %2 tippen + diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index e50aadad..ead1ed69 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -494,15 +494,14 @@ TypingDisplay - - - is typing - πληκτρολογεί - - - - are typing - πληκτρολογούν + + + %1 and %2 are typing + Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.) + + + + diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index e031c4ec..0ab8d6d8 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -494,15 +494,14 @@ TypingDisplay - - - is typing - - - - - are typing - + + + %1 and %2 are typing + Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.) + + %1%2 is typing + %1 and %2 are typing + diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index 2baba55d..95403f3e 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -494,15 +494,14 @@ TypingDisplay - - - is typing - - - - - are typing - + + + %1 and %2 are typing + Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.) + + + + diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index 355c4325..9c7f25c6 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -495,15 +495,14 @@ TypingDisplay - - - is typing - est en train d'écrire - - - - are typing - sont en train d'écrire + + + %1 and %2 are typing + Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.) + + + + diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index db56dc0f..dbf81401 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -494,15 +494,14 @@ TypingDisplay - - - is typing - is aan het typen - - - - are typing - zijn aan het typen + + + %1 and %2 are typing + Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.) + + + + diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index 34a4ed26..f4cbfd56 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -494,15 +494,15 @@ TypingDisplay - - - is typing - pisze - - - - are typing - piszą + + + %1 and %2 are typing + Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.) + + + + + diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index afe36ef9..f31b23cf 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -494,15 +494,15 @@ TypingDisplay - - - is typing - печатает - - - - are typing - печатают + + + %1 and %2 are typing + Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.) + + + + + diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index 607b2ba9..8da7c475 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -494,15 +494,13 @@ TypingDisplay - - - is typing - 正在打字 - - - - are typing - 正在打字 + + + %1 and %2 are typing + Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.) + + + diff --git a/src/TypingDisplay.cpp b/src/TypingDisplay.cpp index 6059601d..43fabcd8 100644 --- a/src/TypingDisplay.cpp +++ b/src/TypingDisplay.cpp @@ -33,6 +33,14 @@ TypingDisplay::setUsers(const QStringList &uid) text_.clear(); + QString temp = text_ += + tr("%1 and %2 are typing", + "Multiple users are typing. First argument is a comma separated list of potentially " + "multiple users. Second argument is the last user of that list. (If only one user is " + "typing, %1 is empty. You should still use it in your string though to silence Qt " + "warnings.)", + uid.size()); + if (uid.isEmpty()) { hide(); update(); @@ -40,12 +48,9 @@ TypingDisplay::setUsers(const QStringList &uid) return; } - text_ = uid.join(", "); - - if (uid.size() == 1) - text_ += tr(" is typing"); - else if (uid.size() > 1) - text_ += tr(" are typing"); + QStringList uidWithoutLast = uid; + uidWithoutLast.pop_back(); + text_ = temp.arg(uidWithoutLast.join(", ")).arg(uid.back()); show(); update(); diff --git a/src/timeline/TimelineItem.h b/src/timeline/TimelineItem.h index a3294d3f..fe354000 100644 --- a/src/timeline/TimelineItem.h +++ b/src/timeline/TimelineItem.h @@ -277,7 +277,7 @@ private: QFutureWatcher *colorGenerating_; QString event_id_; - mtx::events::MessageType message_type_ = mtx::events::MessageType::Unknown; + mtx::events::MessageType message_type_ = mtx::events::MessageType::Unknown; QString room_id_; DescInfo descriptionMsg_; -- cgit 1.5.1 From 2ae91e1e5ce0d750848a210a6573a4b5f5b6122d Mon Sep 17 00:00:00 2001 From: nheko rocks Date: Sun, 28 Jul 2019 10:21:45 +0000 Subject: Translated using Weblate (German) Currently translated at 93.1% (162 of 174 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/de/ --- resources/langs/nheko_de.ts | 160 ++++++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 80 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index f592a4d8..a2351181 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -78,7 +78,7 @@ Low priority rooms - Unwichtige Räume + Räume niedriger Priorität @@ -136,7 +136,7 @@ Remove - + Löschen @@ -159,7 +159,7 @@ Device name - + Gerätename @@ -169,27 +169,27 @@ Autodiscovery failed. Received malformed response. - + Automatische Erkennung fehlgeschlagen. Antwort war fehlerhaft. Autodiscovery failed. Unknown error when requesting .well-known. - + Automatische Erkennung fehlgeschlagen. Unbekannter Fehler bei Anfrage .well-known. The required endpoints were not found. Possibly not a Matrix server. - + Benötigte Ansprechpunkte nicht auffindbar. Möglicherweise kein Matrixserver. Received malformed response. Make sure the homeserver domain is valid. - + Erhaltene Antwort war fehlerhaft. Bitte Homeserverdomain prüfen. An unknown error occured. Make sure the homeserver domain is valid. - + Ein unbekannter Fehler ist aufgetreten. Bitte Homeserverdomain prüfen. @@ -215,7 +215,7 @@ Search for a room... - Raum suchen... + Raum suchen… @@ -238,7 +238,7 @@ Home Server - Heimserver + Homeserver @@ -263,7 +263,7 @@ Invalid server name - Ungültiger Server-Name + Ungültiger Servername @@ -271,7 +271,7 @@ Logout - + Abmelden @@ -279,7 +279,7 @@ no version stored - + keine Version gespeichert @@ -292,7 +292,7 @@ Accept - Akzeptieren + Akzeptieren @@ -305,7 +305,7 @@ User settings - + Benutzereinstellungen @@ -320,12 +320,12 @@ Start a new chat - + Neues Gespräch beginnen Room directory - + Raumverzeichnis @@ -333,22 +333,22 @@ Encrypted - + Verschlüsselt Delivered - + Erhalten Seen - + Gelesen Sent - + Gesendet @@ -356,23 +356,23 @@ Send a file - + Versende Datei Write a message... - Schreibe eine Nachricht... + Schreibe eine Nachricht… Send a message - + Versende eine Nachricht Emoji - + Emoji @@ -387,7 +387,7 @@ Connection lost. Nheko is trying to re-connect... - + Verbindung verloren. Nheko versucht sie wieder aufzunehmen… @@ -395,17 +395,17 @@ Message redaction failed: %1 - + Nachricht zurückziehen fehlgeschlagen: %1 Reply - + Antworten Options - + Optionen @@ -413,7 +413,7 @@ Encryption is enabled - + Verschlüsselung aktiv @@ -421,7 +421,7 @@ Room options - + Raumoptionen @@ -475,7 +475,7 @@ Logout - + Abmelden @@ -513,17 +513,17 @@ Scale factor - + Skalierungsfaktor Font size - + Schriftgröße Font Family - + Schriftart @@ -533,7 +533,7 @@ Device ID - + Geräte-ID @@ -543,22 +543,22 @@ Session Keys - + Sitzungsschlüssel IMPORT - + IMPORTIEREN EXPORT - + EXPORTIEREN ENCRYPTION - + VERSCHLÜSSELUNG @@ -582,34 +582,34 @@ Error - + Feher File Password - + Password für Datei Enter the passphrase to decrypt the file: - + Bitte gib das Passwort zum Enschlüsseln der Datei ein: The password cannot be empty - + Das Passwort darf nicht leer sein Enter passphrase to encrypt your session keys: - + Bitte gib das Passwort zum Verschlüsseln der Sitzungsschlüssel ein: File to save the exported session keys - + Datei zum Speichern der zu exportierenden Sitzungsschlüssel @@ -617,7 +617,7 @@ Welcome to nheko! The desktop client for the Matrix protocol. - Willkommen bei nheko, dem Desktop-Client für das Matrix-Protokoll. + Willkommen bei nheko! Ein Desktop-Client für das Matrix-Protokoll. @@ -640,17 +640,17 @@ Create room - + Raum erstellen Cancel - Abbrechen + Abbrechen Name - Titel + Raumname @@ -660,7 +660,7 @@ Alias - Alias + Raumalias @@ -683,7 +683,7 @@ Cancel - Abbrechen + Abbrechen @@ -696,12 +696,12 @@ Join - + Betreten Cancel - Abbrechen + Abbrechen @@ -714,7 +714,7 @@ Cancel - Abbrechen + Abbrechen @@ -727,7 +727,7 @@ Cancel - Abbrechen + Abbrechen @@ -762,12 +762,12 @@ Medien-Größe: %2 Cancel - Abbrechen + Abbrechen Confirm - + Bestätigen @@ -785,7 +785,7 @@ Medien-Größe: %2 Close - + Schließen @@ -798,22 +798,22 @@ Medien-Größe: %2 Settings - Einstellungen + Einstellungen Info - + Informationen Internal ID - + interne ID Room Version - + Raumversion @@ -858,12 +858,12 @@ Medien-Größe: %2 Encryption - + Verschlüsselung End-to-End Encryption - + Ende-zu-Ende Verschlüsselung @@ -873,7 +873,7 @@ Medien-Größe: %2 Respond to key requests - + Schlüsselnfrage beantworten @@ -885,9 +885,9 @@ Medien-Größe: %2 %n member(s) - - - + + %n Teilnehmer + %n Teilnehmer @@ -898,33 +898,33 @@ Medien-Größe: %2 Failed to enable encryption: %1 - + Aktivierung der Verschlüsselung fehlgeschlagen: %1 Select an avatar - + Wähle einen Avatar All Files (*) - Alle Dateien (*) + Alle Dateien (*) The selected media is not an image - + Die ausgewählte Datei ist keine Bilddatei Error while reading media: %1 - + Fehler beim lesen der Datei: %1 Failed to upload image: %s - + Hochladen der Bilddatei fehlgeschlagen: %s @@ -932,27 +932,27 @@ Medien-Größe: %2 Ban the user from the room - + Banne den Nutzer aus diesem Raum Ignore messages from this user - + Nachrichten von diesem Nutzer ignorieren Kick the user from the room - + Entferne diesen Nutzer aus dem Raum Start a conversation - + Gespräch beginnen Devices - + Geräte -- cgit 1.5.1 From e35ddd845d8811e101cf4e28f3705d7ae7ab88b6 Mon Sep 17 00:00:00 2001 From: "DeepBlueV7.X" Date: Sun, 28 Jul 2019 11:50:41 +0000 Subject: Translated using Weblate (German) Currently translated at 93.1% (162 of 174 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/de/ --- resources/langs/nheko_de.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index a2351181..6c57dcbb 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -39,7 +39,7 @@ Failed to restore save data. Please login again. - Nachrichten konnten nicht aus dem Cache geladen werden. Bitte melde dich erneut an. + Nachrichten konnten nicht aus dem Cache geladen werden. Bitte melde dich erneut an. @@ -50,7 +50,7 @@ Please try to login again: %1 - Bitte melde dich erneut an: %1 + Bitte melde dich erneut an: %1 @@ -102,7 +102,7 @@ Cancel - Abbrechen + Abbrechen -- cgit 1.5.1 From 9f9e2dc7b6e79405bc2f27b612a77f898c7ec7c2 Mon Sep 17 00:00:00 2001 From: "DeepBlueV7.X" Date: Sun, 28 Jul 2019 11:18:46 +0000 Subject: Translated using Weblate (English) Currently translated at 96.6% (168 of 174 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/en/ --- resources/langs/nheko_en.ts | 234 ++++++++++++++++++++++---------------------- 1 file changed, 118 insertions(+), 116 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index d8259dc5..93e006b1 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -215,7 +215,7 @@ Search for a room... - Search for a room... + Search for a room… @@ -333,22 +333,22 @@ Encrypted - + Encrypted Delivered - + Delivered Seen - + Seen Sent - + Sent @@ -356,38 +356,38 @@ Send a file - + Send a file Write a message... - + Write a message… Send a message - + Send a message Emoji - + Emoji Select a file - + Select a file All Files (*) - + All Files (*) Connection lost. Nheko is trying to re-connect... - + Connection lost. Nheko is trying to re-connect… @@ -395,17 +395,17 @@ Message redaction failed: %1 - + Message redaction failed: %1 Reply - + Reply Options - + Options @@ -413,7 +413,7 @@ Encryption is enabled - + Encryption is enabled @@ -421,27 +421,27 @@ Room options - + Room options Invite users - + Invite users Members - + Members Leave room - + Leave room Settings - + Settings @@ -449,12 +449,12 @@ Show - + Show Quit - + Quit @@ -462,12 +462,12 @@ is typing - + is typing are typing - + are typing @@ -475,7 +475,7 @@ Logout - + Logout @@ -483,92 +483,92 @@ Minimize to tray - + Minimize to tray Start in tray - + Start in tray Group's sidebar - + Group's sidebar Typing notifications - + Typing notifications Read receipts - + Read receipts Desktop notifications - + Desktop notifications Scale factor - + Scale factor Font size - + Font size Font Family - + Font Family Theme - + Theme Device ID - + Device ID Device Fingerprint - + Device Fingerprint Session Keys - + Session Keys IMPORT - + IMPORT EXPORT - + EXPORT ENCRYPTION - + ENCRYPTION GENERAL - + GENERAL Open Sessions File - + Open Sessions File @@ -582,34 +582,34 @@ Error - + Error File Password - + File Password Enter the passphrase to decrypt the file: - + Enter the passphrase to decrypt the file: The password cannot be empty - + The password cannot be empty Enter passphrase to encrypt your session keys: - + Enter passphrase to encrypt your session keys: File to save the exported session keys - + File to save the exported session keys @@ -617,22 +617,22 @@ Welcome to nheko! The desktop client for the Matrix protocol. - + Welcome to nheko! The desktop client for the Matrix protocol. Enjoy your stay! - + Enjoy your stay! REGISTER - + REGISTER LOGIN - + LOGIN @@ -640,42 +640,42 @@ Create room - + Create room Cancel - + Cancel Name - + Name Topic - + Topic Alias - + Alias Room Visibility - + Room Visibility Room Preset - + Room Preset Direct Chat - + Direct Chat @@ -683,12 +683,12 @@ Cancel - + Cancel User ID to invite - + User ID to invite @@ -696,17 +696,17 @@ Join - + Join Cancel - + Cancel Room ID or alias - + Room ID or alias @@ -714,12 +714,12 @@ Cancel - + Cancel Are you sure you want to leave? - + Are you sure you want to leave? @@ -727,12 +727,12 @@ Cancel - + Cancel Logout. Are you sure? - + Logout. Are you sure? @@ -740,19 +740,21 @@ Upload - + Upload Cancel - + Cancel Media type: %1 Media size: %2 - + Media type: %1 +Media size: %2 + @@ -760,17 +762,17 @@ Media size: %2 Cancel - + Cancel Confirm - + Confirm Solve the reCAPTCHA and press the confirm button - + Solve the reCAPTCHA and press the confirm button @@ -778,12 +780,12 @@ Media size: %2 Read receipts - + Read receipts Close - + Close @@ -796,72 +798,72 @@ Media size: %2 Settings - + Settings Info - + Info Internal ID - + Internal ID Room Version - + Room Version Notifications - + Notifications Muted - + Muted Mentions only - + Mentions only All messages - + All messages Room access - + Room access Anyone and guests - + Anyone and guests Anyone - + Anyone who knows the room link (no guests) Invited users - + Invited users Encryption - + Encryption End-to-End Encryption - + End-to-End Encryption @@ -871,7 +873,7 @@ Media size: %2 Respond to key requests - + Respond to key requests @@ -883,9 +885,9 @@ Media size: %2 %n member(s) - - - + + %n member + %n members @@ -896,33 +898,33 @@ Media size: %2 Failed to enable encryption: %1 - + Failed to enable encryption: %1 Select an avatar - + Select an avatar All Files (*) - + All Files (*) The selected media is not an image - + The selected media is not an image Error while reading media: %1 - + Error while reading media: %1 Failed to upload image: %s - + Failed to upload image: %s @@ -930,27 +932,27 @@ Media size: %2 Ban the user from the room - + Ban the user from the room Ignore messages from this user - + Ignore messages from this user Kick the user from the room - + Kick the user from the room Start a conversation - + Start a conversation Devices - + Devices @@ -963,42 +965,42 @@ Media size: %2 Smileys & People - Smileys & People + Smileys & People Animals & Nature - Animals & Nature + Animals & Nature Food & Drink - Food & Drink + Food & Drink Activity - Activity + Activity Travel & Places - Travel & Places + Travel & Places Objects - Objects + Objects Symbols - Symbols + Symbols Flags - Flags + Flags -- cgit 1.5.1 From b25b87e87701f50459bd9cb855cecd188595c21a Mon Sep 17 00:00:00 2001 From: Tulir Date: Sun, 28 Jul 2019 10:06:11 +0000 Subject: Translated using Weblate (Finnish) Currently translated at 94.8% (165 of 174 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/fi/ --- resources/langs/nheko_fi.ts | 340 ++++++++++++++++++++++---------------------- 1 file changed, 171 insertions(+), 169 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index e257f9d8..cb7185e2 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -6,7 +6,7 @@ Save File - + Tallenna tiedosto @@ -14,53 +14,53 @@ Failed to upload image. Please try again. - + Kuvan lähettäminen epäonnistui. Ole hyvä ja yritä uudelleen. Failed to upload file. Please try again. - + Tiedoston lähettäminen epäonnistui. Ole hyvä ja yritä uudelleen. Failed to upload audio. Please try again. - + Äänitiedoston lähettäminen epäonnistui. Ole hyvä ja yritä uudelleen. Failed to upload video. Please try again. - + Videon lähettäminen epäonnistui. Ole hyvä ja yritä uudelleen. Failed to restore OLM account. Please login again. - + OLM-tilin palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen. Failed to restore save data. Please login again. - + Tallennettujen tietojen palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen. Failed to setup encryption keys. Server response: %1 %2. Please try again later. - + Salausavainten lähetys epäonnistui. Palvelimen vastaus: %1 %2. Ole hyvä ja yritä uudelleen myöhemmin. Please try to login again: %1 - + Ole hyvä ja yritä kirjautua sisään uudelleen: %1 Room creation failed: %1 - + Huoneen luominen epäonnistui: %1 Failed to leave room: %1 - + Huoneesta poistuminen epäonnistui: %1 @@ -68,28 +68,28 @@ All rooms - + Kaikki huoneet Favourite rooms - + Suosikkihuoneet Low priority rooms - + Alhaisen prioriteetin huoneet (tag) - + (tag) (community) - + (community) @@ -97,22 +97,22 @@ Apply - + Tallenna Cancel - + Peruuta Name - + Nimi Topic - + Aihe @@ -120,7 +120,7 @@ Save File - + Tallenna tiedosto @@ -128,7 +128,7 @@ Save image - + Tallenna kuva @@ -136,7 +136,7 @@ Remove - + Poista @@ -144,57 +144,57 @@ Matrix ID - + Matrix-tunnus e.g @joe:matrix.org - + esim. @joe:matrix.org Password - + Salasana Device name - + Laitteen nimi LOGIN - + KIRJAUDU Autodiscovery failed. Received malformed response. - + Palvelimen tietojen hakeminen epäonnistui: virheellinen vastaus. Autodiscovery failed. Unknown error when requesting .well-known. - + Palvelimen tietojen hakeminen epäonnistui: tuntematon virhe hakiessa .well-known -tiedostoa. The required endpoints were not found. Possibly not a Matrix server. - + Vaadittuja päätepisteitä ei löydetty. Mahdollisesti ei Matrix-palvelin. Received malformed response. Make sure the homeserver domain is valid. - + Vastaanotettiin virheellinen vastaus. Varmista, että kotipalvelimen osoite on pätevä. An unknown error occured. Make sure the homeserver domain is valid. - + Tapahtui tuntematon virhe. Varmista, että kotipalvelimen osoite on pätevä. Empty password - + Tyhjä salasana @@ -202,7 +202,7 @@ Room members - + Huoneen jäsenet @@ -215,7 +215,7 @@ Search for a room... - + Etsi huonetta… @@ -223,47 +223,47 @@ Username - + Käyttäjänimi Password - + Salasana Password confirmation - + Salasanan varmistus Home Server - + Kotipalvelin REGISTER - + REKISTERÖIDY Invalid username - + Epäkelpo käyttäjänimi Password is not long enough (min 8 chars) - + Salasana ei ole tarpeeksi pitkä (vähintään 8 merkkiä) Passwords don't match - + Salasanat eivät täsmää Invalid server name - + Epäkelpo palvelimen nimi @@ -271,7 +271,7 @@ Logout - + Kirjaudu ulos @@ -279,7 +279,7 @@ no version stored - + ei tallennettua versiota @@ -287,17 +287,17 @@ Leave room - + Poistu huoneesta Accept - + Hyväksy Decline - + Hylkää @@ -305,27 +305,27 @@ User settings - + Käyttäjäasetukset Create new room - + Luo uusi huone Join a room - + Liity huoneeseen Start a new chat - + Aloita uusi keskustelu Room directory - + Huoneluettelo @@ -333,22 +333,22 @@ Encrypted - + Salattu Delivered - + Toimitettu Seen - + Luettu Sent - + Lähetetty @@ -356,38 +356,38 @@ Send a file - + Lähetä tiedosto Write a message... - + Kirjoita viesti… Send a message - + Lähetä viesti Emoji - + Emoji Select a file - + Valitse tiedosto All Files (*) - + Kaikki tiedostot (*) Connection lost. Nheko is trying to re-connect... - + Yhteys kadotettu. Nheko yrittää muodostaa yhteyttä uudelleen… @@ -395,17 +395,17 @@ Message redaction failed: %1 - + Viestin poisto epäonnistui: %1 Reply - + Vastaa Options - + Asetukset @@ -413,7 +413,7 @@ Encryption is enabled - + Salaus on käytössä @@ -421,27 +421,27 @@ Room options - + Huonevaihtoehdot Invite users - + Kutsu käyttäjiä Members - + Jäsenet Leave room - + Poistu huoneesta Settings - + Asetukset @@ -449,12 +449,12 @@ Show - + Näytä Quit - + Lopeta @@ -462,12 +462,12 @@ is typing - + kirjoittaa are typing - + kirjoittavat @@ -475,7 +475,7 @@ Logout - + Kirjaudu ulos @@ -483,92 +483,92 @@ Minimize to tray - + Pienennä ilmoitusalueelle Start in tray - + Aloita ilmoitusalueella Group's sidebar - + Ryhmäsivupalkki Typing notifications - + Kirjoitusilmoitukset Read receipts - + Lukukuittaukset Desktop notifications - + Työpöytäilmoitukset Scale factor - + Mittakerroin Font size - + Fonttikoko Font Family - + Fontti Theme - + Teema Device ID - + Laitteen tunnus Device Fingerprint - + Laitteen sormenjälki Session Keys - + Istunnon avaimet IMPORT - + TUO EXPORT - + VIE ENCRYPTION - + SALAUS GENERAL - + YLEISET ASETUKSET Open Sessions File - + Avaa Istuntoavaintiedosto @@ -582,34 +582,34 @@ Error - + Virhe File Password - + Tiedoston Salasana Enter the passphrase to decrypt the file: - + Anna salasana tiedoston salauksen purkamiseksi: The password cannot be empty - + Salasana ei voi olla tyhjä Enter passphrase to encrypt your session keys: - + Anna salasana istuntoavaimien salaamiseksi: File to save the exported session keys - + Tiedosto, johon viedyt istuntoavaimet tallennetaan @@ -617,7 +617,7 @@ Welcome to nheko! The desktop client for the Matrix protocol. - + Tervetuloa nhekoon! Työpöytäsovellus Matrix-protokollalle. @@ -627,12 +627,12 @@ REGISTER - + REKISTERÖIDY LOGIN - + KIRJAUDU @@ -640,42 +640,42 @@ Create room - + Luo huone Cancel - + Peruuta Name - + Nimi Topic - + Aihe Alias - + Osoite Room Visibility - + Huoneen näkyvyys Room Preset - + Huoneen esiasetus Direct Chat - + Suora keskustelu @@ -683,12 +683,12 @@ Cancel - + Peruuta User ID to invite - + Käyttäjätunnus kutsuttavaksi @@ -696,17 +696,17 @@ Join - + Liity Cancel - + Peruuta Room ID or alias - + Huoneen tunnus tai osoite @@ -714,12 +714,12 @@ Cancel - + Peruuta Are you sure you want to leave? - + Oletko varma, että haluat poistua? @@ -727,12 +727,12 @@ Cancel - + Peruuta Logout. Are you sure? - + Kirjaudutaan ulos. Oletko varma? @@ -740,19 +740,21 @@ Upload - + Lähetä Cancel - + Peruuta Media type: %1 Media size: %2 - + Median tyyppi: %1 +Median koko: %2 + @@ -760,17 +762,17 @@ Media size: %2 Cancel - + Peruuta Confirm - + Vahvista Solve the reCAPTCHA and press the confirm button - + Ratkaise reCAPTCHA ja paina varmista-nappia @@ -778,12 +780,12 @@ Media size: %2 Read receipts - + Lukukuittaukset Close - + Sulje @@ -796,72 +798,72 @@ Media size: %2 Settings - + Asetukset Info - + Tiedot Internal ID - + Sisäinen tunnus Room Version - + Huoneen versio Notifications - + Ilmoitukset Muted - + Vaimennettu Mentions only - + Vain maininnat All messages - + Kaikki viestit Room access - + Pääsy huoneeseen Anyone and guests - + Kaikki (mukaanlukien vieraat) Anyone - + Kaikki (poislukien vieraat) Invited users - + Kutsutut käyttäjät Encryption - + Salaus End-to-End Encryption - + Päästä-päähän-salaus @@ -871,7 +873,7 @@ Media size: %2 Respond to key requests - + Vastaa avainpyyntöihin @@ -883,9 +885,9 @@ Media size: %2 %n member(s) - - - + + %n käyttäjä + %n käyttäjää @@ -896,33 +898,33 @@ Media size: %2 Failed to enable encryption: %1 - + Salauksen aktivointi epäonnistui: %1 Select an avatar - + Valitse profiilikuva All Files (*) - + Kaikki Tiedostot (*) The selected media is not an image - + Valittu tiedosto ei ole kuva Error while reading media: %1 - + Virhe lukiessa tiedostoa: %1 Failed to upload image: %s - + Kuvan lähetys epäonnistui: %s @@ -930,27 +932,27 @@ Media size: %2 Ban the user from the room - + Anna käyttäjälle porttikielto huoneesta Ignore messages from this user - + Piilota tämän käyttäjän viestit Kick the user from the room - + Potki käyttäjä huoneesta Start a conversation - + Aloita keskustelu Devices - + Laitteet @@ -963,42 +965,42 @@ Media size: %2 Smileys & People - + Hymiöt ja ihmiset Animals & Nature - + Eläimet ja luonto Food & Drink - + Ruoka ja juoma Activity - + Aktiviteetti Travel & Places - + Matkailu ja paikat Objects - + Esineet Symbols - + Symbolit Flags - + Liput -- cgit 1.5.1 From 0c5745a9df511a0f60880195e636bae4ba66603a Mon Sep 17 00:00:00 2001 From: "DeepBlueV7.X" Date: Sun, 28 Jul 2019 19:13:26 +0000 Subject: Translated using Weblate (English) Currently translated at 98.9% (183 of 185 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/en/ --- resources/langs/nheko_en.ts | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 298abfc7..036f2768 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -207,7 +207,7 @@ OK - + OK @@ -419,31 +419,31 @@ -- Encrypted Event (No keys found for decryption) -- Placeholder, when the message was not decrypted yet or can't be decrypted - + -- Encrypted Event (No keys found for decryption) -- -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. - + -- Decryption Error (failed to communicate with DB) -- -- Decryption Error (failed to retrieve megolm keys from db) -- Placeholder, when the message can't be decrypted, because the DB access failed. - + -- Decryption Error (failed to retrieve megolm keys from db) -- -- Decryption Error (%1) -- Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 - + -- Decryption Error (%1) -- -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet - + -- Encrypted Event (Unknown event type) -- @@ -456,7 +456,7 @@ Mentions - + Mentions @@ -562,7 +562,7 @@ Emoji Font Famly - + Emoji Font Family @@ -679,7 +679,7 @@ Yesterday - + Yesterday @@ -840,12 +840,12 @@ Media size: %2 Today %1 - + Today %1 Yesterday %1 - + Yesterday %1 @@ -1053,27 +1053,27 @@ Media size: %2 You - + You sent a file. - + sent a file. sent an image. - + sent an image. sent an audio file. - + sent an audio file. sent a video - + sent a video. -- cgit 1.5.1 From 19aa05bc9454918ac878b5cf3bca2319b64a27ea Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 28 Jul 2019 21:27:11 +0200 Subject: Manually translate long source strings --- resources/langs/nheko_en.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 036f2768..f1ff8fe9 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -923,7 +923,7 @@ Media size: %2 Encryption is currently experimental and things might break unexpectedly. <br>Please take note that it can't be disabled afterwards. - + Encryption is currently experimental and things might break unexpectedly. <br>Please take note that it can't be disabled afterwards. @@ -935,7 +935,9 @@ Media size: %2 Whether or not the client should respond automatically with the session keys upon request. Use with caution, this is a temporary measure to test the E2E implementation until device verification is completed. - + Whether or not the client should respond automatically with the session keys + upon request. Use with caution, this is a temporary measure to test the + E2E implementation until device verification is completed. -- cgit 1.5.1 From 02bd56d5bd1e085c7e01448bd2665840566bf9cc Mon Sep 17 00:00:00 2001 From: nheko rocks Date: Sun, 28 Jul 2019 19:33:50 +0000 Subject: Translated using Weblate (German) Currently translated at 97.8% (181 of 185 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/de/ --- resources/langs/nheko_de.ts | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 84c712ba..d13c547a 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -39,12 +39,12 @@ Failed to restore save data. Please login again. - Nachrichten konnten nicht aus dem Cache geladen werden. Bitte melde dich erneut an. + Gespeicherte Nachrichten konnten nicht wiederhergestellt werden. Bitte melde Dich erneut an. Failed to setup encryption keys. Server response: %1 %2. Please try again later. - Erstellung des Schlüsselmaterials fehlgeschlagen. Antwort des Servers: %1 %2. Bitte versuche es später erneut. + Fehler beim Setup der Verschlüsselungsschlüssel. Servermeldung: %1 %2. Bitte versuche es später erneut. @@ -84,12 +84,12 @@ (tag) - (tag) + (tag) (community) - + (community) @@ -207,7 +207,7 @@ OK - + OK @@ -419,31 +419,31 @@ -- Encrypted Event (No keys found for decryption) -- Placeholder, when the message was not decrypted yet or can't be decrypted - + -- verschlüsselter Event (keine Schlüssel zur Entschlüsselung gefunden) -- -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. - + -- Entschlüsselungsfehler (Fehler bei Kommunikation mit Datenbank) -- -- Decryption Error (failed to retrieve megolm keys from db) -- Placeholder, when the message can't be decrypted, because the DB access failed. - + -- Entschlüsselungsfehler (Fehler bei Suche nach megolm Schlüsseln in Datenbank) -- -- Decryption Error (%1) -- Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 - + -- Entschlüsselungsfehler (%1) -- -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet - + -- verschlüsselter Event (Unbekannter Eventtyp) -- @@ -456,7 +456,7 @@ Mentions - + Erwähnungen @@ -542,7 +542,7 @@ Desktop notifications - + Desktopbenachrichtigungen @@ -562,7 +562,7 @@ Emoji Font Famly - + Emoji Schriftart @@ -577,7 +577,7 @@ Device Fingerprint - + Gerätefingerabdruck @@ -607,7 +607,7 @@ Open Sessions File - + Öffne Sessions Datei @@ -661,7 +661,7 @@ Enjoy your stay! - Genieße deinen Aufenthalt! + Viel Vergnügen! @@ -679,7 +679,7 @@ Yesterday - + Gestern @@ -840,12 +840,12 @@ Medien-Größe: %2 Today %1 - + Heute %1 Yesterday %1 - + Gestern %1 @@ -923,7 +923,7 @@ Medien-Größe: %2 Encryption is currently experimental and things might break unexpectedly. <br>Please take note that it can't be disabled afterwards. - + Verschlüsselung befindet sich momentan in einem experimentellen Stadium, unerwartete Fehler können auftreten. <br>Sie kann anschließend nicht wieder deaktiviert werden. @@ -935,7 +935,7 @@ Medien-Größe: %2 Whether or not the client should respond automatically with the session keys upon request. Use with caution, this is a temporary measure to test the E2E implementation until device verification is completed. - + Ob nheko automatisch auf Anfragen mit Sessionschlüsseln antworten soll, oder nicht. Bitte mit Vorsicht nutzen, da dies eine temporäre Massnahme ist. Sie dient dem Test von E2E Verschlüsselung, bis die Geräteverifikation fertig gestellt ist. @@ -1053,7 +1053,7 @@ Medien-Größe: %2 You - + Du -- cgit 1.5.1 From 129a97bcf6e39a7f0a0686133880bd3f7495b4a3 Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 28 Jul 2019 20:11:00 +0000 Subject: Translated using Weblate (German) Currently translated at 97.8% (181 of 185 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/de/ --- resources/langs/nheko_de.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index d13c547a..d18c1173 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -14,7 +14,7 @@ Failed to upload image. Please try again. - Hochladen der Bilddatei fehlgeschlagen. Bitte versuche es erneut. + Hochladen des Bildes fehlgeschlagen. Bitte versuche es erneut. -- cgit 1.5.1 From b33307b74a9206a4f3a2ef3931ce5ee8536055e3 Mon Sep 17 00:00:00 2001 From: Tulir Date: Sun, 28 Jul 2019 19:33:20 +0000 Subject: Translated using Weblate (Finnish) Currently translated at 97.3% (180 of 185 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/fi/ --- resources/langs/nheko_fi.ts | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index 718f1084..f382a4f4 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -207,7 +207,7 @@ OK - + OK @@ -419,31 +419,31 @@ -- Encrypted Event (No keys found for decryption) -- Placeholder, when the message was not decrypted yet or can't be decrypted - + -- Salattu viesti (salauksen purkuavaimia ei löydetty) -- -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. - + -- Virhe purkaessa salausta (tietokannan kanssa kommunikointi epäonnistui) -- -- Decryption Error (failed to retrieve megolm keys from db) -- Placeholder, when the message can't be decrypted, because the DB access failed. - + -- Virhe purkaessa salausta (megolm-avaimien hakeminen tietokannasta epäonnistui) -- -- Decryption Error (%1) -- Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1 - + -- Virhe purkaessa salausta (%1) -- -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet - + -- Salattu viesti (tuntematon viestityyppi) -- @@ -456,7 +456,7 @@ Mentions - + Maininnat @@ -489,7 +489,7 @@ Quit - Lopeta + Lopeta @@ -498,9 +498,9 @@ %1 and %2 are typing Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.) - - - + + %1%2 kirjoittaa + %1 ja %2 kirjoittavat @@ -557,12 +557,12 @@ Font Family - Fontti + Fonttiperhe Emoji Font Famly - + Emoji-fonttiperhe @@ -679,7 +679,7 @@ Yesterday - + Eilen @@ -840,12 +840,12 @@ Median koko: %2 Today %1 - + Tänään %1 Yesterday %1 - + Eilen %1 @@ -923,7 +923,7 @@ Median koko: %2 Encryption is currently experimental and things might break unexpectedly. <br>Please take note that it can't be disabled afterwards. - + Salaus on tällä hetkellä kokeellinen ja asiat saattavat mennä rikki odottamattomasti.<br>Huomaa, ettei sitä voi poistaa käytöstä jälkikäteen. @@ -935,7 +935,9 @@ Median koko: %2 Whether or not the client should respond automatically with the session keys upon request. Use with caution, this is a temporary measure to test the E2E implementation until device verification is completed. - + Pitäisikö asiakasohjelman palauttaa salausavaimet automaattisesti pyydettäessä. + Käytä varoen, tämä on väliaikainen vaihtoehto salausjärjestelmän testausta varten, + kunnes laitteiden vahvistus on valmis. @@ -987,7 +989,7 @@ Median koko: %2 Ignore messages from this user - Piilota tämän käyttäjän viestit + Jätä tämän käyttäjän viestit huomiotta @@ -1053,7 +1055,7 @@ Median koko: %2 You - + Sinä -- cgit 1.5.1 From a9375add32ae6c5cd90679cf6cb7e2af18c27e7a Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 28 Jul 2019 18:40:23 -0400 Subject: Address 'sent' translation issue --- CHANGELOG.md | 9 +++++++ resources/langs/nheko_de.ts | 61 +++++++++++++++++++++++++++++++++++++++--- resources/langs/nheko_el.ts | 53 ++++++++++++++++++++++++++++++++++++ resources/langs/nheko_en.ts | 61 +++++++++++++++++++++++++++++++++++++++--- resources/langs/nheko_fi.ts | 61 +++++++++++++++++++++++++++++++++++++++--- resources/langs/nheko_fr.ts | 53 ++++++++++++++++++++++++++++++++++++ resources/langs/nheko_nl.ts | 53 ++++++++++++++++++++++++++++++++++++ resources/langs/nheko_pl.ts | 53 ++++++++++++++++++++++++++++++++++++ resources/langs/nheko_ru.ts | 53 ++++++++++++++++++++++++++++++++++++ resources/langs/nheko_zh_CN.ts | 53 ++++++++++++++++++++++++++++++++++++ src/Utils.h | 53 +++++++++++++++++++++++------------- 11 files changed, 532 insertions(+), 31 deletions(-) (limited to 'resources') diff --git a/CHANGELOG.md b/CHANGELOG.md index 9df96e65..55e59332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,22 @@ ### [0.7.0] -- Unreleased +0.7.0 *requires* mtxclient 0.3.0. Make sure you compile against 0.3.0 +if you do not use the mtxclient bundled with nheko. + #### Features - Make nheko session import / export format match riot. Fixes #48 (WIP) - Implement proper replies (WIP) +- Add .well-known support for auto-completing homeserver information +- Add mentions viewer so you can see all the messages you have been mentioned in (WIP) +- Add emoji font selection preference #### Improvements - Add dedicated reply button to Timeline items. Add button for other options so that right click isn't always required. +- Fix various things with regards to emoji rendering and the emoji picker (WIP) +- Lots and lots and lots of localization updates. +- Additional tweaks to the system theme ## [0.6.4] - 2019-05-22 diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 84c712ba..2099d059 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -962,13 +962,13 @@ Medien-Größe: %2 - The selected media is not an image - Die ausgewählte Datei ist keine Bilddatei + The selected file is not an image + - Error while reading media: %1 - Fehler beim lesen der Datei: %1 + Error while reading file: %1 + @@ -1052,6 +1052,7 @@ Medien-Größe: %2 utils + You @@ -1075,5 +1076,57 @@ Medien-Größe: %2 sent a video + + + sent + For when you are the sender + + + + + sent + For when someone else is the sender + + + + + %1 an audio clip + + + + + %1 an image + + + + + %1 a file + + + + + %1 a video clip + + + + + %1 a sticker + + + + + %1 a notification + + + + + %1 an encrypted message + + + + + Unknown Message Type + + diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index ead1ed69..c8805905 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -1050,6 +1050,7 @@ Media size: %2 utils + You @@ -1073,5 +1074,57 @@ Media size: %2 sent a video + + + sent + For when you are the sender + + + + + sent + For when someone else is the sender + + + + + %1 an audio clip + + + + + %1 an image + + + + + %1 a file + + + + + %1 a video clip + + + + + %1 a sticker + + + + + %1 a notification + + + + + %1 an encrypted message + + + + + Unknown Message Type + + diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 298abfc7..5dcb4f61 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -962,13 +962,13 @@ Media size: %2 - The selected media is not an image - The selected media is not an image + The selected file is not an image + - Error while reading media: %1 - Error while reading media: %1 + Error while reading file: %1 + @@ -1052,6 +1052,7 @@ Media size: %2 utils + You @@ -1075,5 +1076,57 @@ Media size: %2 sent a video + + + sent + For when you are the sender + + + + + sent + For when someone else is the sender + + + + + %1 an audio clip + + + + + %1 an image + + + + + %1 a file + + + + + %1 a video clip + + + + + %1 a sticker + + + + + %1 a notification + + + + + %1 an encrypted message + + + + + Unknown Message Type + + diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index 718f1084..86374eb4 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -962,13 +962,13 @@ Median koko: %2 - The selected media is not an image - Valittu tiedosto ei ole kuva + The selected file is not an image + - Error while reading media: %1 - Virhe lukiessa tiedostoa: %1 + Error while reading file: %1 + @@ -1052,6 +1052,7 @@ Median koko: %2 utils + You @@ -1075,5 +1076,57 @@ Median koko: %2 sent a video + + + sent + For when you are the sender + + + + + sent + For when someone else is the sender + + + + + %1 an audio clip + + + + + %1 an image + + + + + %1 a file + + + + + %1 a video clip + + + + + %1 a sticker + + + + + %1 a notification + + + + + %1 an encrypted message + + + + + Unknown Message Type + + diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index 9c7f25c6..100b78aa 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -1053,6 +1053,7 @@ Taille du média : %2 utils + You @@ -1076,5 +1077,57 @@ Taille du média : %2 sent a video + + + sent + For when you are the sender + + + + + sent + For when someone else is the sender + + + + + %1 an audio clip + + + + + %1 an image + + + + + %1 a file + + + + + %1 a video clip + + + + + %1 a sticker + + + + + %1 a notification + + + + + %1 an encrypted message + + + + + Unknown Message Type + + diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index dbf81401..59642683 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -1052,6 +1052,7 @@ Mediagrootte: %2 utils + You @@ -1075,5 +1076,57 @@ Mediagrootte: %2 sent a video + + + sent + For when you are the sender + + + + + sent + For when someone else is the sender + + + + + %1 an audio clip + + + + + %1 an image + + + + + %1 a file + + + + + %1 a video clip + + + + + %1 a sticker + + + + + %1 a notification + + + + + %1 an encrypted message + + + + + Unknown Message Type + + diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index f4cbfd56..74d08608 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -1056,6 +1056,7 @@ Rozmiar multimediów: %2 utils + You @@ -1079,5 +1080,57 @@ Rozmiar multimediów: %2 sent a video + + + sent + For when you are the sender + + + + + sent + For when someone else is the sender + + + + + %1 an audio clip + + + + + %1 an image + + + + + %1 a file + + + + + %1 a video clip + + + + + %1 a sticker + + + + + %1 a notification + + + + + %1 an encrypted message + + + + + Unknown Message Type + + diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index f31b23cf..b2b18ee3 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -1055,6 +1055,7 @@ Media size: %2 utils + You @@ -1078,5 +1079,57 @@ Media size: %2 sent a video + + + sent + For when you are the sender + + + + + sent + For when someone else is the sender + + + + + %1 an audio clip + + + + + %1 an image + + + + + %1 a file + + + + + %1 a video clip + + + + + %1 a sticker + + + + + %1 a notification + + + + + %1 an encrypted message + + + + + Unknown Message Type + + diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index 8da7c475..772b32d2 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -1060,6 +1060,7 @@ Media size: %2 utils + You @@ -1083,5 +1084,57 @@ Media size: %2 sent a video + + + sent + For when you are the sender + + + + + sent + For when someone else is the sender + + + + + %1 an audio clip + + + + + %1 an image + + + + + %1 a file + + + + + %1 a video clip + + + + + %1 a sticker + + + + + %1 a notification + + + + + %1 an encrypted message + + + + + Unknown Message Type + + diff --git a/src/Utils.h b/src/Utils.h index 756dc1e3..d2aa6d93 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -9,6 +9,7 @@ #include "timeline/widgets/ImageItem.h" #include "timeline/widgets/VideoItem.h" +#include #include #include #include @@ -79,7 +80,9 @@ event_body(const mtx::events::collections::TimelineEvents &event); //! Match widgets/events with a description message. template QString -messageDescription(const QString &username = "", const QString &body = "") +messageDescription(const QString &username = "", + const QString &body = "", + const bool isLocal = false) { using Audio = mtx::events::RoomEvent; using Emote = mtx::events::RoomEvent; @@ -91,24 +94,34 @@ messageDescription(const QString &username = "", const QString &body = "") using Video = mtx::events::RoomEvent; using Encrypted = mtx::events::EncryptedEvent; - if (std::is_same::value || std::is_same::value) - return QString("sent an audio clip"); - else if (std::is_same::value || std::is_same::value) - return QString("sent an image"); - else if (std::is_same::value || std::is_same::value) - return QString("sent a file"); - else if (std::is_same::value || std::is_same::value) - return QString("sent a video clip"); - else if (std::is_same::value || std::is_same::value) - return QString("sent a sticker"); - else if (std::is_same::value) - return QString("sent a notification"); - else if (std::is_same::value) + // Sometimes the verb form of sent changes in some languages depending on the actor. + auto remoteSent = + QCoreApplication::translate("utils", "sent", "For when you are the sender"); + auto localSent = + QCoreApplication::translate("utils", "sent", "For when someone else is the sender"); + QString sentVerb = isLocal ? localSent : remoteSent; + if (std::is_same::value || std::is_same::value) { + return QCoreApplication::translate("utils", "%1 an audio clip").arg(sentVerb); + } else if (std::is_same::value || std::is_same::value) { + return QCoreApplication::translate("utils", "%1 an image").arg(sentVerb); + } else if (std::is_same::value || std::is_same::value) { + return QCoreApplication::translate("utils", "%1 a file").arg(sentVerb); + } else if (std::is_same::value || std::is_same::value) { + return QCoreApplication::translate("utils", "%1 a video clip").arg(sentVerb); + } else if (std::is_same::value || std::is_same::value) { + return QCoreApplication::translate("utils", "%1 a sticker").arg(sentVerb); + } else if (std::is_same::value) { + return QCoreApplication::translate("utils", "%1 a notification").arg(sentVerb); + } else if (std::is_same::value) { return QString(": %1").arg(body); - else if (std::is_same::value) + } else if (std::is_same::value) { return QString("* %1 %2").arg(username).arg(body); - else if (std::is_same::value) - return QString("sent an encrypted message"); + } else if (std::is_same::value) { + return QCoreApplication::translate("utils", "%1 an encrypted message") + .arg(sentVerb); + } else { + return QCoreApplication::translate("utils", "Unknown Message Type"); + } } template @@ -129,10 +142,12 @@ createDescriptionInfo(const Event &event, const QString &localUser, const QStrin return DescInfo{ QString::fromStdString(msg.event_id), - isEmote ? "" : (sender == localUser ? "You" : username), + isEmote ? "" + : (sender == localUser ? QCoreApplication::translate("utils", "You") : username), sender, (isText || isEmote) - ? messageDescription(username, QString::fromStdString(msg.content.body).trimmed()) + ? messageDescription( + username, QString::fromStdString(msg.content.body).trimmed(), sender == localUser) : QString(" %1").arg(messageDescription()), utils::descriptiveTime(ts), ts}; -- cgit 1.5.1 From 7bd452aed932bb865c7a5dd868d0fcd3f45dfae7 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 28 Jul 2019 22:42:00 +0000 Subject: Translated using Weblate (English) Currently translated at 100.0% (195 of 195 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/en/ --- resources/langs/nheko_en.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 2f4739ad..794647c1 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -965,12 +965,12 @@ Media size: %2 The selected file is not an image - + The selected file is not an image Error while reading file: %1 - + Error while reading file: %1 @@ -1082,53 +1082,53 @@ Media size: %2 sent For when you are the sender - + sent sent For when someone else is the sender - + sent %1 an audio clip - + %1 an audio clip %1 an image - + %1 an image %1 a file - + %1 a file %1 a video clip - + %1 a video clip %1 a sticker - + %1 a sticker %1 a notification - + %1 a notification %1 an encrypted message - + %1 an encrypted message Unknown Message Type - + Unknown Message Type -- cgit 1.5.1 From b875a8debc771b6192b37db04570009fca1d0a6c Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 28 Jul 2019 18:45:37 -0400 Subject: Update translation context --- resources/langs/nheko_de.ts | 79 +++++++++++++++++-------------- resources/langs/nheko_el.ts | 75 +++++++++++++++++------------- resources/langs/nheko_en.ts | 103 ++++++++++++++++++++++------------------- resources/langs/nheko_fi.ts | 79 +++++++++++++++++-------------- resources/langs/nheko_fr.ts | 75 +++++++++++++++++------------- resources/langs/nheko_nl.ts | 75 +++++++++++++++++------------- resources/langs/nheko_pl.ts | 75 +++++++++++++++++------------- resources/langs/nheko_ru.ts | 75 +++++++++++++++++------------- resources/langs/nheko_zh_CN.ts | 75 +++++++++++++++++------------- src/Utils.h | 18 +++---- 10 files changed, 405 insertions(+), 324 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 35240772..15497d60 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -1049,82 +1049,91 @@ Medien-Größe: %2 - utils + message-description sent: - - - You - Du + + %1 an audio clip + - - sent a file. + + %1 an image - - sent an image. + + %1 a file - - sent an audio file. + + %1 a video clip - - sent a video + + %1 a sticker - - sent - For when you are the sender + + %1 a notification - - sent - For when someone else is the sender + + %1 an encrypted message + + + message-description: - - %1 an audio clip + + sent + For when someone else is the sender + + + message-description: - - %1 an image + + sent + For when you are the sender + + + utils - - %1 a file - + + + You + Du - - %1 a video clip + + sent a file. - - %1 a sticker + + sent an image. - - %1 a notification + + sent an audio file. - - %1 an encrypted message + + sent a video - + Unknown Message Type diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index c8805905..84b76ba4 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -1047,82 +1047,91 @@ Media size: %2 - utils + message-description sent: - - - You + + %1 an audio clip - - sent a file. + + %1 an image - - sent an image. + + %1 a file - - sent an audio file. + + %1 a video clip - - sent a video + + %1 a sticker - - sent - For when you are the sender + + %1 a notification - - sent - For when someone else is the sender + + %1 an encrypted message + + + message-description: - - %1 an audio clip + + sent + For when someone else is the sender + + + message-description: - - %1 an image + + sent + For when you are the sender + + + utils - - %1 a file + + + You - - %1 a video clip + + sent a file. - - %1 a sticker + + sent an image. - - %1 a notification + + sent an audio file. - - %1 an encrypted message + + sent a video - + Unknown Message Type diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 794647c1..f44f8a73 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -1051,82 +1051,91 @@ Media size: %2 - utils - - - - You - You - - - - sent a file. - sent a file. - - - - sent an image. - sent an image. - - - - sent an audio file. - sent an audio file. - - - - sent a video - sent a video. - + message-description sent: - - sent - For when you are the sender - sent - - - - sent - For when someone else is the sender - sent - - - + %1 an audio clip - %1 an audio clip + %1 an audio clip %1 an image - %1 an image + %1 an image %1 a file - %1 a file + %1 a file %1 a video clip - %1 a video clip + %1 a video clip %1 a sticker - %1 a sticker + %1 a sticker %1 a notification - %1 a notification + %1 a notification %1 an encrypted message - %1 an encrypted message + %1 an encrypted message + + + + message-description: + + + sent + For when someone else is the sender + sent + + + + message-description: + + + sent + For when you are the sender + sent + + + + utils + + + + You + You + + + + sent a file. + sent a file. + + + + sent an image. + sent an image. + sent an audio file. + sent an audio file. + + + + sent a video + sent a video. + + + Unknown Message Type Unknown Message Type diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index e3116dfe..6494664a 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -1051,82 +1051,91 @@ Median koko: %2 - utils + message-description sent: - - - You - Sinä + + %1 an audio clip + - - sent a file. + + %1 an image - - sent an image. + + %1 a file - - sent an audio file. + + %1 a video clip - - sent a video + + %1 a sticker - - sent - For when you are the sender + + %1 a notification - - sent - For when someone else is the sender + + %1 an encrypted message + + + message-description: - - %1 an audio clip + + sent + For when someone else is the sender + + + message-description: - - %1 an image + + sent + For when you are the sender + + + utils - - %1 a file - + + + You + Sinä - - %1 a video clip + + sent a file. - - %1 a sticker + + sent an image. - - %1 a notification + + sent an audio file. - - %1 an encrypted message + + sent a video - + Unknown Message Type diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index 100b78aa..600d191c 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -1050,82 +1050,91 @@ Taille du média : %2 - utils + message-description sent: - - - You + + %1 an audio clip - - sent a file. + + %1 an image - - sent an image. + + %1 a file - - sent an audio file. + + %1 a video clip - - sent a video + + %1 a sticker - - sent - For when you are the sender + + %1 a notification - - sent - For when someone else is the sender + + %1 an encrypted message + + + message-description: - - %1 an audio clip + + sent + For when someone else is the sender + + + message-description: - - %1 an image + + sent + For when you are the sender + + + utils - - %1 a file + + + You - - %1 a video clip + + sent a file. - - %1 a sticker + + sent an image. - - %1 a notification + + sent an audio file. - - %1 an encrypted message + + sent a video - + Unknown Message Type diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index 59642683..aa1c6928 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -1049,82 +1049,91 @@ Mediagrootte: %2 - utils + message-description sent: - - - You + + %1 an audio clip - - sent a file. + + %1 an image - - sent an image. + + %1 a file - - sent an audio file. + + %1 a video clip - - sent a video + + %1 a sticker - - sent - For when you are the sender + + %1 a notification - - sent - For when someone else is the sender + + %1 an encrypted message + + + message-description: - - %1 an audio clip + + sent + For when someone else is the sender + + + message-description: - - %1 an image + + sent + For when you are the sender + + + utils - - %1 a file + + + You - - %1 a video clip + + sent a file. - - %1 a sticker + + sent an image. - - %1 a notification + + sent an audio file. - - %1 an encrypted message + + sent a video - + Unknown Message Type diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index 74d08608..4c90292f 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -1053,82 +1053,91 @@ Rozmiar multimediów: %2 - utils + message-description sent: - - - You + + %1 an audio clip - - sent a file. + + %1 an image - - sent an image. + + %1 a file - - sent an audio file. + + %1 a video clip - - sent a video + + %1 a sticker - - sent - For when you are the sender + + %1 a notification - - sent - For when someone else is the sender + + %1 an encrypted message + + + message-description: - - %1 an audio clip + + sent + For when someone else is the sender + + + message-description: - - %1 an image + + sent + For when you are the sender + + + utils - - %1 a file + + + You - - %1 a video clip + + sent a file. - - %1 a sticker + + sent an image. - - %1 a notification + + sent an audio file. - - %1 an encrypted message + + sent a video - + Unknown Message Type diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index b2b18ee3..958e93fa 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -1052,82 +1052,91 @@ Media size: %2 - utils + message-description sent: - - - You + + %1 an audio clip - - sent a file. + + %1 an image - - sent an image. + + %1 a file - - sent an audio file. + + %1 a video clip - - sent a video + + %1 a sticker - - sent - For when you are the sender + + %1 a notification - - sent - For when someone else is the sender + + %1 an encrypted message + + + message-description: - - %1 an audio clip + + sent + For when someone else is the sender + + + message-description: - - %1 an image + + sent + For when you are the sender + + + utils - - %1 a file + + + You - - %1 a video clip + + sent a file. - - %1 a sticker + + sent an image. - - %1 a notification + + sent an audio file. - - %1 an encrypted message + + sent a video - + Unknown Message Type diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index 772b32d2..8c7b2d34 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -1057,82 +1057,91 @@ Media size: %2 - utils + message-description sent: - - - You + + %1 an audio clip - - sent a file. + + %1 an image - - sent an image. + + %1 a file - - sent an audio file. + + %1 a video clip - - sent a video + + %1 a sticker - - sent - For when you are the sender + + %1 a notification - - sent - For when someone else is the sender + + %1 an encrypted message + + + message-description: - - %1 an audio clip + + sent + For when someone else is the sender + + + message-description: - - %1 an image + + sent + For when you are the sender + + + utils - - %1 a file + + + You - - %1 a video clip + + sent a file. - - %1 a sticker + + sent an image. - - %1 a notification + + sent an audio file. - - %1 an encrypted message + + sent a video - + Unknown Message Type diff --git a/src/Utils.h b/src/Utils.h index d2aa6d93..40906b6a 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -96,28 +96,28 @@ messageDescription(const QString &username = "", // Sometimes the verb form of sent changes in some languages depending on the actor. auto remoteSent = - QCoreApplication::translate("utils", "sent", "For when you are the sender"); + QCoreApplication::translate("message-description: ", "sent", "For when you are the sender"); auto localSent = - QCoreApplication::translate("utils", "sent", "For when someone else is the sender"); + QCoreApplication::translate("message-description:", "sent", "For when someone else is the sender"); QString sentVerb = isLocal ? localSent : remoteSent; if (std::is_same::value || std::is_same::value) { - return QCoreApplication::translate("utils", "%1 an audio clip").arg(sentVerb); + return QCoreApplication::translate("message-description sent:", "%1 an audio clip").arg(sentVerb); } else if (std::is_same::value || std::is_same::value) { - return QCoreApplication::translate("utils", "%1 an image").arg(sentVerb); + return QCoreApplication::translate("message-description sent:", "%1 an image").arg(sentVerb); } else if (std::is_same::value || std::is_same::value) { - return QCoreApplication::translate("utils", "%1 a file").arg(sentVerb); + return QCoreApplication::translate("message-description sent:", "%1 a file").arg(sentVerb); } else if (std::is_same::value || std::is_same::value) { - return QCoreApplication::translate("utils", "%1 a video clip").arg(sentVerb); + return QCoreApplication::translate("message-description sent:", "%1 a video clip").arg(sentVerb); } else if (std::is_same::value || std::is_same::value) { - return QCoreApplication::translate("utils", "%1 a sticker").arg(sentVerb); + return QCoreApplication::translate("message-description sent:", "%1 a sticker").arg(sentVerb); } else if (std::is_same::value) { - return QCoreApplication::translate("utils", "%1 a notification").arg(sentVerb); + return QCoreApplication::translate("message-description sent:", "%1 a notification").arg(sentVerb); } else if (std::is_same::value) { return QString(": %1").arg(body); } else if (std::is_same::value) { return QString("* %1 %2").arg(username).arg(body); } else if (std::is_same::value) { - return QCoreApplication::translate("utils", "%1 an encrypted message") + return QCoreApplication::translate("message-description sent:", "%1 an encrypted message") .arg(sentVerb); } else { return QCoreApplication::translate("utils", "Unknown Message Type"); -- cgit 1.5.1 From fd2d4d6db3c1ed93f1860260a0519c2284b97ffa Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 28 Jul 2019 23:14:10 -0400 Subject: Update mentions dialog Mentions are now separated into 'this room' and 'all rooms' tab., which allows the user to filter on the current room if they desire. Should add additional logic in the future to show which room the mention was in the for the 'all rooms' view. --- resources/langs/nheko_de.ts | 31 ++++++++++++----- resources/langs/nheko_el.ts | 31 ++++++++++++----- resources/langs/nheko_en.ts | 31 ++++++++++++----- resources/langs/nheko_fi.ts | 31 ++++++++++++----- resources/langs/nheko_fr.ts | 31 ++++++++++++----- resources/langs/nheko_nl.ts | 31 ++++++++++++----- resources/langs/nheko_pl.ts | 31 ++++++++++++----- resources/langs/nheko_ru.ts | 31 ++++++++++++----- resources/langs/nheko_zh_CN.ts | 31 ++++++++++++----- src/ChatPage.cpp | 5 ++- src/dialogs/UserMentions.cpp | 75 +++++++++++++++++++++++++++++++++--------- src/dialogs/UserMentions.h | 15 ++++++--- 12 files changed, 270 insertions(+), 104 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 15497d60..b596fb67 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. Hochladen des Bildes fehlgeschlagen. Bitte versuche es erneut. @@ -977,6 +977,19 @@ Medien-Größe: %2 Hochladen der Bilddatei fehlgeschlagen: %s + + dialogs::UserMentions + + + This Room + + + + + All Rooms + + + dialogs::UserProfile @@ -1056,32 +1069,32 @@ Medien-Größe: %2 - + %1 an image - + %1 a file - + %1 a video clip - + %1 a sticker - + %1 a notification - + %1 an encrypted message @@ -1089,7 +1102,7 @@ Medien-Größe: %2 message-description: - + sent For when someone else is the sender @@ -1108,7 +1121,7 @@ Medien-Größe: %2 utils - + You Du diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index 84b76ba4..700c3d57 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. @@ -975,6 +975,19 @@ Media size: %2 + + dialogs::UserMentions + + + This Room + + + + + All Rooms + + + dialogs::UserProfile @@ -1054,32 +1067,32 @@ Media size: %2 - + %1 an image - + %1 a file - + %1 a video clip - + %1 a sticker - + %1 a notification - + %1 an encrypted message @@ -1087,7 +1100,7 @@ Media size: %2 message-description: - + sent For when someone else is the sender @@ -1106,7 +1119,7 @@ Media size: %2 utils - + You diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index f44f8a73..a8329a94 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. Failed to upload image. Please try again. @@ -979,6 +979,19 @@ Media size: %2 Failed to upload image: %s + + dialogs::UserMentions + + + This Room + + + + + All Rooms + + + dialogs::UserProfile @@ -1058,32 +1071,32 @@ Media size: %2 %1 an audio clip - + %1 an image %1 an image - + %1 a file %1 a file - + %1 a video clip %1 a video clip - + %1 a sticker %1 a sticker - + %1 a notification %1 a notification - + %1 an encrypted message %1 an encrypted message @@ -1091,7 +1104,7 @@ Media size: %2 message-description: - + sent For when someone else is the sender sent @@ -1110,7 +1123,7 @@ Media size: %2 utils - + You You diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index 6494664a..89eb33b7 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. Kuvan lähettäminen epäonnistui. Ole hyvä ja yritä uudelleen. @@ -979,6 +979,19 @@ Median koko: %2 Kuvan lähetys epäonnistui: %s + + dialogs::UserMentions + + + This Room + + + + + All Rooms + + + dialogs::UserProfile @@ -1058,32 +1071,32 @@ Median koko: %2 - + %1 an image - + %1 a file - + %1 a video clip - + %1 a sticker - + %1 a notification - + %1 an encrypted message @@ -1091,7 +1104,7 @@ Median koko: %2 message-description: - + sent For when someone else is the sender @@ -1110,7 +1123,7 @@ Median koko: %2 utils - + You Sinä diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index 600d191c..42f82b0f 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. @@ -978,6 +978,19 @@ Taille du média : %2 + + dialogs::UserMentions + + + This Room + + + + + All Rooms + + + dialogs::UserProfile @@ -1057,32 +1070,32 @@ Taille du média : %2 - + %1 an image - + %1 a file - + %1 a video clip - + %1 a sticker - + %1 a notification - + %1 an encrypted message @@ -1090,7 +1103,7 @@ Taille du média : %2 message-description: - + sent For when someone else is the sender @@ -1109,7 +1122,7 @@ Taille du média : %2 utils - + You diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index aa1c6928..53840f82 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. @@ -977,6 +977,19 @@ Mediagrootte: %2 + + dialogs::UserMentions + + + This Room + + + + + All Rooms + + + dialogs::UserProfile @@ -1056,32 +1069,32 @@ Mediagrootte: %2 - + %1 an image - + %1 a file - + %1 a video clip - + %1 a sticker - + %1 a notification - + %1 an encrypted message @@ -1089,7 +1102,7 @@ Mediagrootte: %2 message-description: - + sent For when someone else is the sender @@ -1108,7 +1121,7 @@ Mediagrootte: %2 utils - + You diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index 4c90292f..f4f98dbb 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. Nie udało się wysłać obrazu. Spróbuj ponownie. @@ -981,6 +981,19 @@ Rozmiar multimediów: %2 Nie udało się wysłać obrazu: %s + + dialogs::UserMentions + + + This Room + + + + + All Rooms + + + dialogs::UserProfile @@ -1060,32 +1073,32 @@ Rozmiar multimediów: %2 - + %1 an image - + %1 a file - + %1 a video clip - + %1 a sticker - + %1 a notification - + %1 an encrypted message @@ -1093,7 +1106,7 @@ Rozmiar multimediów: %2 message-description: - + sent For when someone else is the sender @@ -1112,7 +1125,7 @@ Rozmiar multimediów: %2 utils - + You diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index 958e93fa..04285c72 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. Не удалось загрузить изображение. Пожалуйста, попробуйте еще раз. @@ -980,6 +980,19 @@ Media size: %2 Не удалось загрузить изображение: %s + + dialogs::UserMentions + + + This Room + + + + + All Rooms + + + dialogs::UserProfile @@ -1059,32 +1072,32 @@ Media size: %2 - + %1 an image - + %1 a file - + %1 a video clip - + %1 a sticker - + %1 a notification - + %1 an encrypted message @@ -1092,7 +1105,7 @@ Media size: %2 message-description: - + sent For when someone else is the sender @@ -1111,7 +1124,7 @@ Media size: %2 utils - + You diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index 8c7b2d34..1e539e64 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -12,7 +12,7 @@ ChatPage - + Failed to upload image. Please try again. 上传图像失败。请重试。 @@ -977,6 +977,19 @@ Media size: %2 上传图像失败：%s + + dialogs::UserMentions + + + This Room + + + + + All Rooms + + + dialogs::UserProfile @@ -1064,32 +1077,32 @@ Media size: %2 - + %1 an image - + %1 a file - + %1 a video clip - + %1 a sticker - + %1 a notification - + %1 an encrypted message @@ -1097,7 +1110,7 @@ Media size: %2 message-description: - + sent For when someone else is the sender @@ -1116,7 +1129,7 @@ Media size: %2 utils - + You diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 18188429..ca18d810 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -91,12 +91,11 @@ ChatPage::ChatPage(QSharedPointer userSettings, QWidget *parent) connect(sidebarActions_, &SideBarActions::createRoom, this, &ChatPage::createRoom); user_info_widget_ = new UserInfoWidget(sideBar_); - // user_mentions_widget_ = new UserMentionsWidget(sideBar_); + // user_mentions_widget_ = new UserMentionsWidget(top_bar_); room_list_ = new RoomList(sideBar_); connect(room_list_, &RoomList::joinRoom, this, &ChatPage::joinRoom); sideBarLayout_->addWidget(user_info_widget_); - // sideBarLayout_->addWidget(user_mentions_widget_); sideBarLayout_->addWidget(room_list_); sideBarLayout_->addWidget(sidebarActions_); @@ -1000,7 +999,7 @@ ChatPage::showNotificationsDialog(const mtx::responses::Notifications &res, cons const auto user_id = utils::event_sender(item.event); const auto body = utils::event_body(item.event); - notifDialog->pushItem(event_id, user_id, body, room_id); + notifDialog->pushItem(event_id, user_id, body, room_id, current_room_); } catch (const lmdb::error &e) { nhlog::db()->warn("error while sending desktop notification: {}", e.what()); diff --git a/src/dialogs/UserMentions.cpp b/src/dialogs/UserMentions.cpp index 8f56ec93..4cfcdaca 100644 --- a/src/dialogs/UserMentions.cpp +++ b/src/dialogs/UserMentions.cpp @@ -1,3 +1,4 @@ +#include #include #include "UserMentions.h" @@ -8,31 +9,50 @@ using namespace dialogs; UserMentions::UserMentions(QWidget *parent) : QWidget{parent} { + tab_layout_ = new QTabWidget(this); + top_layout_ = new QVBoxLayout(this); top_layout_->setSpacing(0); top_layout_->setMargin(0); - scroll_area_ = new QScrollArea(this); - scroll_area_->setWidgetResizable(true); - scroll_area_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + local_scroll_area_ = new QScrollArea(this); + local_scroll_area_->setWidgetResizable(true); + local_scroll_area_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + + local_scroll_widget_ = new QWidget(this); + local_scroll_widget_->setObjectName("local_scroll_widget"); + + all_scroll_area_ = new QScrollArea(this); + all_scroll_area_->setWidgetResizable(true); + all_scroll_area_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - scroll_widget_ = new QWidget(this); - scroll_widget_->setObjectName("scroll_widget"); + all_scroll_widget_ = new QWidget(this); + all_scroll_widget_->setObjectName("all_scroll_widget"); // Height of the typing display. QFont f; f.setPointSizeF(f.pointSizeF() * 0.9); const int bottomMargin = QFontMetrics(f).height() + 6; - scroll_layout_ = new QVBoxLayout(scroll_widget_); - scroll_layout_->setContentsMargins(4, 0, 15, bottomMargin); - scroll_layout_->setSpacing(0); - scroll_layout_->setObjectName("timelinescrollarea"); + local_scroll_layout_ = new QVBoxLayout(local_scroll_widget_); + local_scroll_layout_->setContentsMargins(4, 0, 15, bottomMargin); + local_scroll_layout_->setSpacing(0); + local_scroll_layout_->setObjectName("localcrollarea"); - scroll_area_->setWidget(scroll_widget_); - scroll_area_->setAlignment(Qt::AlignBottom); + all_scroll_layout_ = new QVBoxLayout(all_scroll_widget_); + all_scroll_layout_->setContentsMargins(4, 0, 15, bottomMargin); + all_scroll_layout_->setSpacing(0); + all_scroll_layout_->setObjectName("allcrollarea"); - top_layout_->addWidget(scroll_area_); + local_scroll_area_->setWidget(local_scroll_widget_); + local_scroll_area_->setAlignment(Qt::AlignBottom); + + all_scroll_area_->setWidget(all_scroll_widget_); + all_scroll_area_->setAlignment(Qt::AlignBottom); + + tab_layout_->addTab(local_scroll_area_, tr("This Room")); + tab_layout_->addTab(all_scroll_area_, tr("All Rooms")); + top_layout_->addWidget(tab_layout_); setLayout(top_layout_); } @@ -41,18 +61,41 @@ void UserMentions::pushItem(const QString &event_id, const QString &user_id, const QString &body, - const QString &room_id) + const QString &room_id, + const QString ¤t_room_id) { + setUpdatesEnabled(false); + + // Add to the 'all' section TimelineItem *view_item = new TimelineItem( - mtx::events::MessageType::Text, user_id, body, true, room_id, scroll_widget_); + mtx::events::MessageType::Text, user_id, body, true, room_id, all_scroll_widget_); view_item->setEventId(event_id); - setUpdatesEnabled(false); view_item->hide(); - scroll_layout_->addWidget(view_item); + all_scroll_layout_->addWidget(view_item); QTimer::singleShot(0, this, [view_item, this]() { view_item->show(); view_item->adjustSize(); setUpdatesEnabled(true); }); + + // if it matches the current room... add it to the current room as well. + if (QString::compare(room_id, current_room_id, Qt::CaseInsensitive) == 0) { + // Add to the 'local' section + TimelineItem *local_view_item = new TimelineItem(mtx::events::MessageType::Text, + user_id, + body, + true, + room_id, + local_scroll_widget_); + local_view_item->setEventId(event_id); + local_view_item->hide(); + + local_scroll_layout_->addWidget(local_view_item); + + QTimer::singleShot(0, this, [local_view_item, this]() { + local_view_item->show(); + local_view_item->adjustSize(); + }); + } } \ No newline at end of file diff --git a/src/dialogs/UserMentions.h b/src/dialogs/UserMentions.h index e995b207..9b43dcfd 100644 --- a/src/dialogs/UserMentions.h +++ b/src/dialogs/UserMentions.h @@ -2,6 +2,7 @@ #include #include +#include #include #include @@ -15,14 +16,20 @@ public: void pushItem(const QString &event_id, const QString &user_id, const QString &body, - const QString &room_id); + const QString &room_id, + const QString ¤t_room_id); private: + QTabWidget *tab_layout_; QVBoxLayout *top_layout_; - QVBoxLayout *scroll_layout_; + QVBoxLayout *local_scroll_layout_; + QVBoxLayout *all_scroll_layout_; - QScrollArea *scroll_area_; - QWidget *scroll_widget_; + QScrollArea *local_scroll_area_; + QWidget *local_scroll_widget_; + + QScrollArea *all_scroll_area_; + QWidget *all_scroll_widget_; }; } \ No newline at end of file -- cgit 1.5.1 From 660851bcb6cd7821d200271142acadef6150c8d5 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 28 Jul 2019 23:03:28 +0000 Subject: Translated using Weblate (English) Currently translated at 100.0% (195 of 195 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/en/ --- resources/langs/nheko_en.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index a8329a94..0f37cc5b 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -1068,37 +1068,37 @@ Media size: %2 %1 an audio clip - %1 an audio clip + %1 an audio clip %1 an image - %1 an image + %1 an image %1 a file - %1 a file + %1 a file %1 a video clip - %1 a video clip + %1 a video clip %1 a sticker - %1 a sticker + %1 a sticker %1 a notification - %1 a notification + %1 a notification %1 an encrypted message - %1 an encrypted message + %1 an encrypted message @@ -1107,7 +1107,7 @@ Media size: %2 sent For when someone else is the sender - sent + sent @@ -1116,7 +1116,7 @@ Media size: %2 sent For when you are the sender - sent + sent -- cgit 1.5.1 From 80a8810116be3a9bd725e2c997c9ac17dba0d3b1 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 29 Jul 2019 03:16:41 +0000 Subject: Translated using Weblate (English) Currently translated at 100.0% (197 of 197 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/en/ --- resources/langs/nheko_en.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 0f37cc5b..edb95313 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -984,12 +984,12 @@ Media size: %2 This Room - + This Room All Rooms - + All Rooms -- cgit 1.5.1 From 493e28b8cbf69bc1e7a82396f7a99b926c8be6b0 Mon Sep 17 00:00:00 2001 From: nheko rocks Date: Mon, 29 Jul 2019 20:26:39 +0000 Subject: Translated using Weblate (German) Currently translated at 97.0% (191 of 197 strings) Translation: Nheko/nheko Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/de/ --- resources/langs/nheko_de.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index b596fb67..e92bf966 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -963,12 +963,12 @@ Medien-Größe: %2 The selected file is not an image - + Die ausgewählte Datei ist kein Bild Error while reading file: %1 - + Fehler beim Lesen der DateI: %1 @@ -982,12 +982,12 @@ Medien-Größe: %2 This Room - + Dieser Raum All Rooms - + Alle Räume @@ -1066,37 +1066,37 @@ Medien-Größe: %2 %1 an audio clip - + %1 einen Audioclip %1 an image - + %1 ein Bild %1 a file - + %1 eine Datei %1 a video clip - + %1 einen Videoclip %1 a sticker - + %1 einen Sticker %1 a notification - + 1% eine Benachrichtigung %1 an encrypted message - + 1% eine verschüsselte Nachricht @@ -1148,7 +1148,7 @@ Medien-Größe: %2 Unknown Message Type - + Unbekannter Nachrichtentyp -- cgit 1.5.1 From 98d4f14bd1ccf4c280be6a5fb965c75217c74b7e Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 29 Aug 2019 18:01:20 -0400 Subject: Fix themeing issues on mentions --- resources/styles/nheko-dark.qss | 11 +++++++++++ resources/styles/nheko.qss | 11 +++++++++++ resources/styles/system.qss | 10 ++++++++++ src/popups/UserMentions.cpp | 12 +++++++++++- src/popups/UserMentions.h | 4 ++++ 5 files changed, 47 insertions(+), 1 deletion(-) (limited to 'resources') diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss index 1e1333b2..1271e39f 100644 --- a/resources/styles/nheko-dark.qss +++ b/resources/styles/nheko-dark.qss @@ -24,6 +24,17 @@ TimelineView > * { border: none; } +UserMentionsWidget, +UserMentionsWidget > * { + background-color: #202228; + border: none; +} + +UserMentionsWidget > TimelineItem { + qproperty-backgroundColor: #202228; + qproperty-hoverColor: rgba(45, 49, 57, 120); +} + #scroll_widget { background-color: #202228; } diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss index a70441be..3c7f3b71 100644 --- a/resources/styles/nheko.qss +++ b/resources/styles/nheko.qss @@ -24,6 +24,17 @@ TimelineView > * { border: none; } +UserMentionsWidget, +UserMentionsWidget > * { + background-color: white; + border: none; +} + +UserMentionsWidget > TimelineItem { + qproperty-backgroundColor: white; + qproperty-hoverColor: rgba(192, 193, 195, 120); +} + #scroll_widget { background-color: white; } diff --git a/resources/styles/system.qss b/resources/styles/system.qss index dfb8ce65..0a8c4b21 100644 --- a/resources/styles/system.qss +++ b/resources/styles/system.qss @@ -12,6 +12,16 @@ TimelineView > * { border: none; } +UserMentionsWidget, +UserMentionsWidget > * { + border: none; +} + +UserMentionsWidget > TimelineItem { + qproperty-backgroundColor: palette(window); + qproperty-hoverColor: palette(base); +} + TextInputWidget { border: none; border-top: 1px solid palette(mid); diff --git a/src/popups/UserMentions.cpp b/src/popups/UserMentions.cpp index 152cd82d..3480959a 100644 --- a/src/popups/UserMentions.cpp +++ b/src/popups/UserMentions.cpp @@ -1,3 +1,5 @@ +#include +#include #include #include @@ -140,7 +142,6 @@ UserMentions::pushItem(const QString &event_id, local_scroll_widget_); local_view_item->setEventId(event_id); local_view_item->hide(); - local_scroll_layout_->addWidget(local_view_item); QTimer::singleShot(0, this, [local_view_item]() { @@ -148,4 +149,13 @@ UserMentions::pushItem(const QString &event_id, local_view_item->adjustSize(); }); } +} + +void +UserMentions::paintEvent(QPaintEvent *) +{ + QStyleOption opt; + opt.init(this); + QPainter p(this); + style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); } \ No newline at end of file diff --git a/src/popups/UserMentions.h b/src/popups/UserMentions.h index a74bf2ec..d7dfc575 100644 --- a/src/popups/UserMentions.h +++ b/src/popups/UserMentions.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -26,6 +27,9 @@ public: void initializeMentions(const QMap ¬ifs); void showPopup(); +protected: + void paintEvent(QPaintEvent *) override; + private: void pushItem(const QString &event_id, const QString &user_id, -- cgit 1.5.1