diff options
-rw-r--r-- | resources/langs/nheko_de.ts | 101 | ||||
-rw-r--r-- | resources/langs/nheko_el.ts | 101 | ||||
-rw-r--r-- | resources/langs/nheko_en.ts | 101 | ||||
-rw-r--r-- | resources/langs/nheko_fr.ts | 101 | ||||
-rw-r--r-- | resources/langs/nheko_nl.ts | 101 | ||||
-rw-r--r-- | resources/langs/nheko_pl.ts | 101 | ||||
-rw-r--r-- | resources/langs/nheko_ru.ts | 103 | ||||
-rw-r--r-- | resources/langs/nheko_zh_CN.ts | 101 | ||||
-rw-r--r-- | src/Utils.cpp | 20 | ||||
-rw-r--r-- | src/dialogs/MemberList.cpp | 4 | ||||
-rw-r--r-- | src/dialogs/ReadReceipts.cpp | 12 | ||||
-rw-r--r-- | src/timeline/TimelineItem.cpp | 2 | ||||
-rw-r--r-- | src/ui/InfoMessage.cpp | 13 |
13 files changed, 668 insertions, 193 deletions
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 @@ <context> <name>AudioItem</name> <message> - <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+117"/> + <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+118"/> <source>Save File</source> <translation>In Datei speichern</translation> </message> @@ -12,7 +12,7 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+309"/> + <location filename="../../src/ChatPage.cpp" line="+331"/> <source>Failed to upload image. Please try again.</source> <translation>Hochladen der Bilddatei fehlgeschlagen. Bitte versuche es erneut.</translation> </message> @@ -32,7 +32,7 @@ <translation>Hochladen der Videodatei fehlgeschlagen. Bitte versuche es erneut.</translation> </message> <message> - <location line="+376"/> + <location line="+380"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Wiederherstellung des OLM Accounts fehlgeschlagen. Bitte logge dich erneut ein.</translation> </message> @@ -42,7 +42,7 @@ <translation type="unfinished">Nachrichten konnten nicht aus dem Cache geladen werden. Bitte melde dich erneut an.</translation> </message> <message> - <location line="+169"/> + <location line="+198"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Erstellung des Schlüsselmaterials fehlgeschlagen. Antwort des Servers: %1 %2. Bitte versuche es später erneut.</translation> </message> @@ -118,7 +118,7 @@ <context> <name>FileItem</name> <message> - <location filename="../../src/timeline/widgets/FileItem.cpp" line="+106"/> + <location filename="../../src/timeline/widgets/FileItem.cpp" line="+107"/> <source>Save File</source> <translation>Datei speichern</translation> </message> @@ -126,7 +126,7 @@ <context> <name>ImageItem</name> <message> - <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+238"/> + <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+241"/> <source>Save image</source> <translation>Bild speichern</translation> </message> @@ -205,8 +205,8 @@ <translation>Teilnehmerliste</translation> </message> <message> - <location line="+33"/> - <source>ESC</source> + <location line="+4"/> + <source>OK</source> <translation type="unfinished"></translation> </message> </context> @@ -277,7 +277,7 @@ <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+2204"/> + <location filename="../../src/Cache.cpp" line="+2205"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -285,12 +285,12 @@ <context> <name>RoomInfoListItem</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+92"/> + <location filename="../../src/RoomInfoListItem.cpp" line="+93"/> <source>Leave room</source> <translation>Raum verlassen</translation> </message> <message> - <location line="+174"/> + <location line="+181"/> <source>Accept</source> <translation>Akzeptieren </translation> </message> @@ -331,7 +331,7 @@ <context> <name>StatusIndicator</name> <message> - <location filename="../../src/timeline/TimelineItem.cpp" line="+106"/> + <location filename="../../src/timeline/TimelineItem.cpp" line="+107"/> <source>Encrypted</source> <translation type="unfinished"></translation> </message> @@ -354,13 +354,13 @@ <context> <name>TextInputWidget</name> <message> - <location filename="../../src/TextInputWidget.cpp" line="+506"/> + <location filename="../../src/TextInputWidget.cpp" line="+507"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> <message> <location line="+13"/> - <location filename="../../src/TextInputWidget.h" line="+168"/> + <location filename="../../src/TextInputWidget.h" line="+164"/> <source>Write a message...</source> <translation>Schreibe eine Nachricht...</translation> </message> @@ -424,7 +424,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+28"/> + <location line="+5"/> + <source>Mentions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>Invite users</source> <translation>Benutzer einladen</translation> </message> @@ -460,7 +465,7 @@ <context> <name>TypingDisplay</name> <message> - <location filename="../../src/TypingDisplay.cpp" line="+45"/> + <location filename="../../src/TypingDisplay.cpp" line="+46"/> <source> is typing</source> <translation> tippt</translation> </message> @@ -481,7 +486,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+156"/> + <location filename="../../src/UserSettingsPage.cpp" line="+166"/> <source>Minimize to tray</source> <translation>Ins Benachrichtigungsfeld minimieren</translation> </message> @@ -521,12 +526,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+13"/> <source>Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>Emoji Font Famly</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+33"/> <source>Theme</source> <translation>Erscheinungsbild</translation> </message> @@ -566,7 +576,7 @@ <translation>ALLGEMEINES</translation> </message> <message> - <location line="+150"/> + <location line="+156"/> <source>Open Sessions File</source> <translation type="unfinished"></translation> </message> @@ -636,6 +646,14 @@ </message> </context> <context> + <name>descriptiveTime</name> + <message> + <location filename="../../src/Utils.cpp" line="+104"/> + <source>Yesterday</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::CreateRoom</name> <message> <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/> @@ -778,7 +796,7 @@ Medien-Größe: %2 <context> <name>dialogs::ReadReceipts</name> <message> - <location filename="../../src/dialogs/ReadReceipts.cpp" line="+119"/> + <location filename="../../src/dialogs/ReadReceipts.cpp" line="+121"/> <source>Read receipts</source> <translation>Lesebestätigungen</translation> </message> @@ -794,6 +812,19 @@ Medien-Größe: %2 </message> </context> <context> + <name>dialogs::ReceiptItem</name> + <message> + <location line="-55"/> + <source>Today %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Yesterday %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::RoomSettings</name> <message> <location filename="../../src/dialogs/RoomSettings.cpp" line="+113"/> @@ -1003,4 +1034,32 @@ Medien-Größe: %2 <translation>Flaggen</translation> </message> </context> +<context> + <name>utils</name> + <message> + <location filename="../../src/Utils.cpp" line="+46"/> + <source>You</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+219"/> + <source>sent a file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an image.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an audio file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent a video</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> 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 @@ <context> <name>AudioItem</name> <message> - <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+117"/> + <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+118"/> <source>Save File</source> <translation>Αποθήκευση</translation> </message> @@ -12,7 +12,7 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+309"/> + <location filename="../../src/ChatPage.cpp" line="+331"/> <source>Failed to upload image. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -32,7 +32,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+376"/> + <location line="+380"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -42,7 +42,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> + <location line="+198"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> @@ -118,7 +118,7 @@ <context> <name>FileItem</name> <message> - <location filename="../../src/timeline/widgets/FileItem.cpp" line="+106"/> + <location filename="../../src/timeline/widgets/FileItem.cpp" line="+107"/> <source>Save File</source> <translation>Αποθήκευση</translation> </message> @@ -126,7 +126,7 @@ <context> <name>ImageItem</name> <message> - <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+238"/> + <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+241"/> <source>Save image</source> <translation>Αποθήκευση Εικόνας</translation> </message> @@ -205,8 +205,8 @@ <translation>Μέλη</translation> </message> <message> - <location line="+33"/> - <source>ESC</source> + <location line="+4"/> + <source>OK</source> <translation type="unfinished"></translation> </message> </context> @@ -277,7 +277,7 @@ <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+2204"/> + <location filename="../../src/Cache.cpp" line="+2205"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -285,12 +285,12 @@ <context> <name>RoomInfoListItem</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+92"/> + <location filename="../../src/RoomInfoListItem.cpp" line="+93"/> <source>Leave room</source> <translation>Βγές</translation> </message> <message> - <location line="+174"/> + <location line="+181"/> <source>Accept</source> <translation>Αποδοχή</translation> </message> @@ -331,7 +331,7 @@ <context> <name>StatusIndicator</name> <message> - <location filename="../../src/timeline/TimelineItem.cpp" line="+106"/> + <location filename="../../src/timeline/TimelineItem.cpp" line="+107"/> <source>Encrypted</source> <translation type="unfinished"></translation> </message> @@ -354,13 +354,13 @@ <context> <name>TextInputWidget</name> <message> - <location filename="../../src/TextInputWidget.cpp" line="+506"/> + <location filename="../../src/TextInputWidget.cpp" line="+507"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> <message> <location line="+13"/> - <location filename="../../src/TextInputWidget.h" line="+168"/> + <location filename="../../src/TextInputWidget.h" line="+164"/> <source>Write a message...</source> <translation>Γράψε ένα μήνυμα...</translation> </message> @@ -424,7 +424,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+28"/> + <location line="+5"/> + <source>Mentions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>Invite users</source> <translation>Προσκάλεσε χρήστες</translation> </message> @@ -460,7 +465,7 @@ <context> <name>TypingDisplay</name> <message> - <location filename="../../src/TypingDisplay.cpp" line="+45"/> + <location filename="../../src/TypingDisplay.cpp" line="+46"/> <source> is typing</source> <translation> πληκτρολογεί</translation> </message> @@ -481,7 +486,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+156"/> + <location filename="../../src/UserSettingsPage.cpp" line="+166"/> <source>Minimize to tray</source> <translation>Ελαχιστοποίηση</translation> </message> @@ -521,12 +526,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+13"/> <source>Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>Emoji Font Famly</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+33"/> <source>Theme</source> <translation>Φόντο</translation> </message> @@ -566,7 +576,7 @@ <translation>ΓΕΝΙΚΑ</translation> </message> <message> - <location line="+150"/> + <location line="+156"/> <source>Open Sessions File</source> <translation type="unfinished"></translation> </message> @@ -636,6 +646,14 @@ </message> </context> <context> + <name>descriptiveTime</name> + <message> + <location filename="../../src/Utils.cpp" line="+104"/> + <source>Yesterday</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::CreateRoom</name> <message> <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/> @@ -776,7 +794,7 @@ Media size: %2 <context> <name>dialogs::ReadReceipts</name> <message> - <location filename="../../src/dialogs/ReadReceipts.cpp" line="+119"/> + <location filename="../../src/dialogs/ReadReceipts.cpp" line="+121"/> <source>Read receipts</source> <translation type="unfinished"></translation> </message> @@ -792,6 +810,19 @@ Media size: %2 </message> </context> <context> + <name>dialogs::ReceiptItem</name> + <message> + <location line="-55"/> + <source>Today %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Yesterday %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::RoomSettings</name> <message> <location filename="../../src/dialogs/RoomSettings.cpp" line="+113"/> @@ -1001,4 +1032,32 @@ Media size: %2 <translation>Σημαίες</translation> </message> </context> +<context> + <name>utils</name> + <message> + <location filename="../../src/Utils.cpp" line="+46"/> + <source>You</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+219"/> + <source>sent a file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an image.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an audio file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent a video</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> 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 @@ <context> <name>AudioItem</name> <message> - <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+117"/> + <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+118"/> <source>Save File</source> <translation>Save File</translation> </message> @@ -12,7 +12,7 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+309"/> + <location filename="../../src/ChatPage.cpp" line="+331"/> <source>Failed to upload image. Please try again.</source> <translation>Failed to upload image. Please try again.</translation> </message> @@ -32,7 +32,7 @@ <translation>Failed to upload video. Please try again.</translation> </message> <message> - <location line="+376"/> + <location line="+380"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Failed to restore OLM account. Please login again.</translation> </message> @@ -42,7 +42,7 @@ <translation>Failed to restore save data. Please login again.</translation> </message> <message> - <location line="+169"/> + <location line="+198"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</translation> </message> @@ -118,7 +118,7 @@ <context> <name>FileItem</name> <message> - <location filename="../../src/timeline/widgets/FileItem.cpp" line="+106"/> + <location filename="../../src/timeline/widgets/FileItem.cpp" line="+107"/> <source>Save File</source> <translation>Save File</translation> </message> @@ -126,7 +126,7 @@ <context> <name>ImageItem</name> <message> - <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+238"/> + <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+241"/> <source>Save image</source> <translation>Save image</translation> </message> @@ -205,8 +205,8 @@ <translation>Room members</translation> </message> <message> - <location line="+33"/> - <source>ESC</source> + <location line="+4"/> + <source>OK</source> <translation type="unfinished"></translation> </message> </context> @@ -277,7 +277,7 @@ <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+2204"/> + <location filename="../../src/Cache.cpp" line="+2205"/> <source>no version stored</source> <translation>no version stored</translation> </message> @@ -285,12 +285,12 @@ <context> <name>RoomInfoListItem</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+92"/> + <location filename="../../src/RoomInfoListItem.cpp" line="+93"/> <source>Leave room</source> <translation>Leave room</translation> </message> <message> - <location line="+174"/> + <location line="+181"/> <source>Accept</source> <translation>Accept</translation> </message> @@ -331,7 +331,7 @@ <context> <name>StatusIndicator</name> <message> - <location filename="../../src/timeline/TimelineItem.cpp" line="+106"/> + <location filename="../../src/timeline/TimelineItem.cpp" line="+107"/> <source>Encrypted</source> <translation type="unfinished"></translation> </message> @@ -354,13 +354,13 @@ <context> <name>TextInputWidget</name> <message> - <location filename="../../src/TextInputWidget.cpp" line="+506"/> + <location filename="../../src/TextInputWidget.cpp" line="+507"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> <message> <location line="+13"/> - <location filename="../../src/TextInputWidget.h" line="+168"/> + <location filename="../../src/TextInputWidget.h" line="+164"/> <source>Write a message...</source> <translation type="unfinished"></translation> </message> @@ -424,7 +424,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+28"/> + <location line="+5"/> + <source>Mentions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>Invite users</source> <translation type="unfinished"></translation> </message> @@ -460,7 +465,7 @@ <context> <name>TypingDisplay</name> <message> - <location filename="../../src/TypingDisplay.cpp" line="+45"/> + <location filename="../../src/TypingDisplay.cpp" line="+46"/> <source> is typing</source> <translation type="unfinished"></translation> </message> @@ -481,7 +486,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+156"/> + <location filename="../../src/UserSettingsPage.cpp" line="+166"/> <source>Minimize to tray</source> <translation type="unfinished"></translation> </message> @@ -521,12 +526,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+13"/> <source>Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>Emoji Font Famly</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+33"/> <source>Theme</source> <translation type="unfinished"></translation> </message> @@ -566,7 +576,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+150"/> + <location line="+156"/> <source>Open Sessions File</source> <translation type="unfinished"></translation> </message> @@ -636,6 +646,14 @@ </message> </context> <context> + <name>descriptiveTime</name> + <message> + <location filename="../../src/Utils.cpp" line="+104"/> + <source>Yesterday</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::CreateRoom</name> <message> <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/> @@ -776,7 +794,7 @@ Media size: %2 <context> <name>dialogs::ReadReceipts</name> <message> - <location filename="../../src/dialogs/ReadReceipts.cpp" line="+119"/> + <location filename="../../src/dialogs/ReadReceipts.cpp" line="+121"/> <source>Read receipts</source> <translation type="unfinished"></translation> </message> @@ -792,6 +810,19 @@ Media size: %2 </message> </context> <context> + <name>dialogs::ReceiptItem</name> + <message> + <location line="-55"/> + <source>Today %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Yesterday %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::RoomSettings</name> <message> <location filename="../../src/dialogs/RoomSettings.cpp" line="+113"/> @@ -1001,4 +1032,32 @@ Media size: %2 <translation type="unfinished">Flags</translation> </message> </context> +<context> + <name>utils</name> + <message> + <location filename="../../src/Utils.cpp" line="+46"/> + <source>You</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+219"/> + <source>sent a file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an image.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an audio file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent a video</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> 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 @@ <context> <name>AudioItem</name> <message> - <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+117"/> + <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+118"/> <source>Save File</source> <translation>Enregistrer le fichier</translation> </message> @@ -12,7 +12,7 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+309"/> + <location filename="../../src/ChatPage.cpp" line="+331"/> <source>Failed to upload image. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -32,7 +32,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+376"/> + <location line="+380"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -42,7 +42,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> + <location line="+198"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> @@ -118,7 +118,7 @@ <context> <name>FileItem</name> <message> - <location filename="../../src/timeline/widgets/FileItem.cpp" line="+106"/> + <location filename="../../src/timeline/widgets/FileItem.cpp" line="+107"/> <source>Save File</source> <translation>Enregistrer le fichier</translation> </message> @@ -126,7 +126,7 @@ <context> <name>ImageItem</name> <message> - <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+238"/> + <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+241"/> <source>Save image</source> <translation>Enregistrer l'image</translation> </message> @@ -205,8 +205,8 @@ <translation>Membres du salon</translation> </message> <message> - <location line="+33"/> - <source>ESC</source> + <location line="+4"/> + <source>OK</source> <translation type="unfinished"></translation> </message> </context> @@ -278,7 +278,7 @@ <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+2204"/> + <location filename="../../src/Cache.cpp" line="+2205"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -286,12 +286,12 @@ <context> <name>RoomInfoListItem</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+92"/> + <location filename="../../src/RoomInfoListItem.cpp" line="+93"/> <source>Leave room</source> <translation>Quitter le salon</translation> </message> <message> - <location line="+174"/> + <location line="+181"/> <source>Accept</source> <translation>Accepter</translation> </message> @@ -332,7 +332,7 @@ <context> <name>StatusIndicator</name> <message> - <location filename="../../src/timeline/TimelineItem.cpp" line="+106"/> + <location filename="../../src/timeline/TimelineItem.cpp" line="+107"/> <source>Encrypted</source> <translation type="unfinished"></translation> </message> @@ -355,13 +355,13 @@ <context> <name>TextInputWidget</name> <message> - <location filename="../../src/TextInputWidget.cpp" line="+506"/> + <location filename="../../src/TextInputWidget.cpp" line="+507"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> <message> <location line="+13"/> - <location filename="../../src/TextInputWidget.h" line="+168"/> + <location filename="../../src/TextInputWidget.h" line="+164"/> <source>Write a message...</source> <translation>Écrivez un message...</translation> </message> @@ -425,7 +425,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+28"/> + <location line="+5"/> + <source>Mentions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>Invite users</source> <translation>Inviter des utilisateurs</translation> </message> @@ -461,7 +466,7 @@ <context> <name>TypingDisplay</name> <message> - <location filename="../../src/TypingDisplay.cpp" line="+45"/> + <location filename="../../src/TypingDisplay.cpp" line="+46"/> <source> is typing</source> <translation> est en train d'écrire</translation> </message> @@ -482,7 +487,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+156"/> + <location filename="../../src/UserSettingsPage.cpp" line="+166"/> <source>Minimize to tray</source> <translation>Réduire à la barre des tâches</translation> </message> @@ -522,12 +527,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+13"/> <source>Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>Emoji Font Famly</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+33"/> <source>Theme</source> <translation>Thème</translation> </message> @@ -567,7 +577,7 @@ <translation>GÉNÉRAL</translation> </message> <message> - <location line="+150"/> + <location line="+156"/> <source>Open Sessions File</source> <translation type="unfinished"></translation> </message> @@ -637,6 +647,14 @@ </message> </context> <context> + <name>descriptiveTime</name> + <message> + <location filename="../../src/Utils.cpp" line="+104"/> + <source>Yesterday</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::CreateRoom</name> <message> <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/> @@ -779,7 +797,7 @@ Taille du média : %2 <context> <name>dialogs::ReadReceipts</name> <message> - <location filename="../../src/dialogs/ReadReceipts.cpp" line="+119"/> + <location filename="../../src/dialogs/ReadReceipts.cpp" line="+121"/> <source>Read receipts</source> <translation>Accusés de lecture</translation> </message> @@ -795,6 +813,19 @@ Taille du média : %2 </message> </context> <context> + <name>dialogs::ReceiptItem</name> + <message> + <location line="-55"/> + <source>Today %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Yesterday %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::RoomSettings</name> <message> <location filename="../../src/dialogs/RoomSettings.cpp" line="+113"/> @@ -1004,4 +1035,32 @@ Taille du média : %2 <translation>Drapeaux</translation> </message> </context> +<context> + <name>utils</name> + <message> + <location filename="../../src/Utils.cpp" line="+46"/> + <source>You</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+219"/> + <source>sent a file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an image.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an audio file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent a video</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> 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 @@ <context> <name>AudioItem</name> <message> - <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+117"/> + <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+118"/> <source>Save File</source> <translation>Bestand opslaan</translation> </message> @@ -12,7 +12,7 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+309"/> + <location filename="../../src/ChatPage.cpp" line="+331"/> <source>Failed to upload image. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -32,7 +32,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+376"/> + <location line="+380"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -42,7 +42,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> + <location line="+198"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> @@ -118,7 +118,7 @@ <context> <name>FileItem</name> <message> - <location filename="../../src/timeline/widgets/FileItem.cpp" line="+106"/> + <location filename="../../src/timeline/widgets/FileItem.cpp" line="+107"/> <source>Save File</source> <translation>Bestand opslaan</translation> </message> @@ -126,7 +126,7 @@ <context> <name>ImageItem</name> <message> - <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+238"/> + <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+241"/> <source>Save image</source> <translation>Afbeelding opslaan</translation> </message> @@ -205,8 +205,8 @@ <translation>Kamerleden</translation> </message> <message> - <location line="+33"/> - <source>ESC</source> + <location line="+4"/> + <source>OK</source> <translation type="unfinished"></translation> </message> </context> @@ -277,7 +277,7 @@ <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+2204"/> + <location filename="../../src/Cache.cpp" line="+2205"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -285,12 +285,12 @@ <context> <name>RoomInfoListItem</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+92"/> + <location filename="../../src/RoomInfoListItem.cpp" line="+93"/> <source>Leave room</source> <translation>Kamer verlaten</translation> </message> <message> - <location line="+174"/> + <location line="+181"/> <source>Accept</source> <translation>Accepteren</translation> </message> @@ -331,7 +331,7 @@ <context> <name>StatusIndicator</name> <message> - <location filename="../../src/timeline/TimelineItem.cpp" line="+106"/> + <location filename="../../src/timeline/TimelineItem.cpp" line="+107"/> <source>Encrypted</source> <translation type="unfinished"></translation> </message> @@ -354,13 +354,13 @@ <context> <name>TextInputWidget</name> <message> - <location filename="../../src/TextInputWidget.cpp" line="+506"/> + <location filename="../../src/TextInputWidget.cpp" line="+507"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> <message> <location line="+13"/> - <location filename="../../src/TextInputWidget.h" line="+168"/> + <location filename="../../src/TextInputWidget.h" line="+164"/> <source>Write a message...</source> <translation>Typ een bericht...</translation> </message> @@ -424,7 +424,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+28"/> + <location line="+5"/> + <source>Mentions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>Invite users</source> <translation>Gebruikers uitnodigen</translation> </message> @@ -460,7 +465,7 @@ <context> <name>TypingDisplay</name> <message> - <location filename="../../src/TypingDisplay.cpp" line="+45"/> + <location filename="../../src/TypingDisplay.cpp" line="+46"/> <source> is typing</source> <translation> is aan het typen</translation> </message> @@ -481,7 +486,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+156"/> + <location filename="../../src/UserSettingsPage.cpp" line="+166"/> <source>Minimize to tray</source> <translation>Minimaliseren naar systeemvak</translation> </message> @@ -521,12 +526,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+13"/> <source>Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>Emoji Font Famly</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+33"/> <source>Theme</source> <translation>Thema</translation> </message> @@ -566,7 +576,7 @@ <translation>ALGEMEEN</translation> </message> <message> - <location line="+150"/> + <location line="+156"/> <source>Open Sessions File</source> <translation type="unfinished"></translation> </message> @@ -636,6 +646,14 @@ </message> </context> <context> + <name>descriptiveTime</name> + <message> + <location filename="../../src/Utils.cpp" line="+104"/> + <source>Yesterday</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::CreateRoom</name> <message> <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/> @@ -778,7 +796,7 @@ Mediagrootte: %2 <context> <name>dialogs::ReadReceipts</name> <message> - <location filename="../../src/dialogs/ReadReceipts.cpp" line="+119"/> + <location filename="../../src/dialogs/ReadReceipts.cpp" line="+121"/> <source>Read receipts</source> <translation>Leesbevestigingen</translation> </message> @@ -794,6 +812,19 @@ Mediagrootte: %2 </message> </context> <context> + <name>dialogs::ReceiptItem</name> + <message> + <location line="-55"/> + <source>Today %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Yesterday %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::RoomSettings</name> <message> <location filename="../../src/dialogs/RoomSettings.cpp" line="+113"/> @@ -1003,4 +1034,32 @@ Mediagrootte: %2 <translation>Vlaggen</translation> </message> </context> +<context> + <name>utils</name> + <message> + <location filename="../../src/Utils.cpp" line="+46"/> + <source>You</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+219"/> + <source>sent a file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an image.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an audio file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent a video</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> 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 @@ <context> <name>AudioItem</name> <message> - <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+117"/> + <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+118"/> <source>Save File</source> <translation>Zapisz plik</translation> </message> @@ -12,7 +12,7 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+309"/> + <location filename="../../src/ChatPage.cpp" line="+331"/> <source>Failed to upload image. Please try again.</source> <translation>Nie udało się wysłać obrazu. Spróbuj ponownie.</translation> </message> @@ -32,7 +32,7 @@ <translation>Nie udało się wysłać filmu. Spróbuj ponownie.</translation> </message> <message> - <location line="+376"/> + <location line="+380"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Nie udało się przywrócić konta OLM. Spróbuj zalogować się ponownie.</translation> </message> @@ -42,7 +42,7 @@ <translation>Nie udało się przywrócić zapisanych danych. Spróbuj zalogować się ponownie.</translation> </message> <message> - <location line="+169"/> + <location line="+198"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> @@ -118,7 +118,7 @@ <context> <name>FileItem</name> <message> - <location filename="../../src/timeline/widgets/FileItem.cpp" line="+106"/> + <location filename="../../src/timeline/widgets/FileItem.cpp" line="+107"/> <source>Save File</source> <translation>Zapisz plik</translation> </message> @@ -126,7 +126,7 @@ <context> <name>ImageItem</name> <message> - <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+238"/> + <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+241"/> <source>Save image</source> <translation>Zapisz obraz</translation> </message> @@ -205,8 +205,8 @@ <translation>Członkowie pokoju</translation> </message> <message> - <location line="+33"/> - <source>ESC</source> + <location line="+4"/> + <source>OK</source> <translation type="unfinished"></translation> </message> </context> @@ -277,7 +277,7 @@ <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+2204"/> + <location filename="../../src/Cache.cpp" line="+2205"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -285,12 +285,12 @@ <context> <name>RoomInfoListItem</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+92"/> + <location filename="../../src/RoomInfoListItem.cpp" line="+93"/> <source>Leave room</source> <translation>Opuść pokój</translation> </message> <message> - <location line="+174"/> + <location line="+181"/> <source>Accept</source> <translation>Akceptuj</translation> </message> @@ -331,7 +331,7 @@ <context> <name>StatusIndicator</name> <message> - <location filename="../../src/timeline/TimelineItem.cpp" line="+106"/> + <location filename="../../src/timeline/TimelineItem.cpp" line="+107"/> <source>Encrypted</source> <translation>Szyfrowana</translation> </message> @@ -354,13 +354,13 @@ <context> <name>TextInputWidget</name> <message> - <location filename="../../src/TextInputWidget.cpp" line="+506"/> + <location filename="../../src/TextInputWidget.cpp" line="+507"/> <source>Send a file</source> <translation>Wyślij plik</translation> </message> <message> <location line="+13"/> - <location filename="../../src/TextInputWidget.h" line="+168"/> + <location filename="../../src/TextInputWidget.h" line="+164"/> <source>Write a message...</source> <translation>Napisz wiadomość…</translation> </message> @@ -424,7 +424,12 @@ <translation>Ustawienia pokoju</translation> </message> <message> - <location line="+28"/> + <location line="+5"/> + <source>Mentions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>Invite users</source> <translation>Zaproś użytkowników</translation> </message> @@ -460,7 +465,7 @@ <context> <name>TypingDisplay</name> <message> - <location filename="../../src/TypingDisplay.cpp" line="+45"/> + <location filename="../../src/TypingDisplay.cpp" line="+46"/> <source> is typing</source> <translation> pisze</translation> </message> @@ -481,7 +486,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+156"/> + <location filename="../../src/UserSettingsPage.cpp" line="+166"/> <source>Minimize to tray</source> <translation>Zminimalizuj do paska zadań</translation> </message> @@ -521,12 +526,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+13"/> <source>Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>Emoji Font Famly</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+33"/> <source>Theme</source> <translation>Motyw</translation> </message> @@ -566,7 +576,7 @@ <translation>OGÓLNE</translation> </message> <message> - <location line="+150"/> + <location line="+156"/> <source>Open Sessions File</source> <translation type="unfinished"></translation> </message> @@ -636,6 +646,14 @@ </message> </context> <context> + <name>descriptiveTime</name> + <message> + <location filename="../../src/Utils.cpp" line="+104"/> + <source>Yesterday</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::CreateRoom</name> <message> <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/> @@ -778,7 +796,7 @@ Rozmiar multimediów: %2 <context> <name>dialogs::ReadReceipts</name> <message> - <location filename="../../src/dialogs/ReadReceipts.cpp" line="+119"/> + <location filename="../../src/dialogs/ReadReceipts.cpp" line="+121"/> <source>Read receipts</source> <translation>Potwierdzenia przeczytania</translation> </message> @@ -794,6 +812,19 @@ Rozmiar multimediów: %2 </message> </context> <context> + <name>dialogs::ReceiptItem</name> + <message> + <location line="-55"/> + <source>Today %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Yesterday %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::RoomSettings</name> <message> <location filename="../../src/dialogs/RoomSettings.cpp" line="+113"/> @@ -1006,4 +1037,32 @@ Rozmiar multimediów: %2 <translation>Flagi</translation> </message> </context> +<context> + <name>utils</name> + <message> + <location filename="../../src/Utils.cpp" line="+46"/> + <source>You</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+219"/> + <source>sent a file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an image.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an audio file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent a video</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> 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 @@ <context> <name>AudioItem</name> <message> - <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+117"/> + <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+118"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> @@ -12,7 +12,7 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+309"/> + <location filename="../../src/ChatPage.cpp" line="+331"/> <source>Failed to upload image. Please try again.</source> <translation>Не удалось загрузить изображение. Пожалуйста, попробуйте еще раз.</translation> </message> @@ -32,7 +32,7 @@ <translation>Не удалось загрузить видео. Пожалуйста, попробуйте еще раз.</translation> </message> <message> - <location line="+376"/> + <location line="+380"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Не удалось восстановить учетную запись OLM. Пожалуйста, войдите снова.</translation> </message> @@ -42,7 +42,7 @@ <translation>Не удалось восстановить сохраненные данные. Пожалуйста, войдите снова.</translation> </message> <message> - <location line="+169"/> + <location line="+198"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Не удалось настроить ключи шифрования. Ответ сервера:%1 %2. Пожалуйста, попробуйте позже.</translation> </message> @@ -118,7 +118,7 @@ <context> <name>FileItem</name> <message> - <location filename="../../src/timeline/widgets/FileItem.cpp" line="+106"/> + <location filename="../../src/timeline/widgets/FileItem.cpp" line="+107"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> @@ -126,7 +126,7 @@ <context> <name>ImageItem</name> <message> - <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+238"/> + <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+241"/> <source>Save image</source> <translation>Сохранить изображение</translation> </message> @@ -205,9 +205,9 @@ <translation>Участники комнаты</translation> </message> <message> - <location line="+33"/> - <source>ESC</source> - <translation></translation> + <location line="+4"/> + <source>OK</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -277,7 +277,7 @@ <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+2204"/> + <location filename="../../src/Cache.cpp" line="+2205"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -285,12 +285,12 @@ <context> <name>RoomInfoListItem</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+92"/> + <location filename="../../src/RoomInfoListItem.cpp" line="+93"/> <source>Leave room</source> <translation>Покинуть комнату</translation> </message> <message> - <location line="+174"/> + <location line="+181"/> <source>Accept</source> <translation>Принять</translation> </message> @@ -331,7 +331,7 @@ <context> <name>StatusIndicator</name> <message> - <location filename="../../src/timeline/TimelineItem.cpp" line="+106"/> + <location filename="../../src/timeline/TimelineItem.cpp" line="+107"/> <source>Encrypted</source> <translation>Зашифровано</translation> </message> @@ -354,13 +354,13 @@ <context> <name>TextInputWidget</name> <message> - <location filename="../../src/TextInputWidget.cpp" line="+506"/> + <location filename="../../src/TextInputWidget.cpp" line="+507"/> <source>Send a file</source> <translation>Отправить файл</translation> </message> <message> <location line="+13"/> - <location filename="../../src/TextInputWidget.h" line="+168"/> + <location filename="../../src/TextInputWidget.h" line="+164"/> <source>Write a message...</source> <translation>Написать сообщение...</translation> </message> @@ -424,7 +424,12 @@ <translation>Настройки комнаты</translation> </message> <message> - <location line="+28"/> + <location line="+5"/> + <source>Mentions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>Invite users</source> <translation>Пригласить пользователей</translation> </message> @@ -460,7 +465,7 @@ <context> <name>TypingDisplay</name> <message> - <location filename="../../src/TypingDisplay.cpp" line="+45"/> + <location filename="../../src/TypingDisplay.cpp" line="+46"/> <source> is typing</source> <translation> печатает</translation> </message> @@ -481,7 +486,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+156"/> + <location filename="../../src/UserSettingsPage.cpp" line="+166"/> <source>Minimize to tray</source> <translation>Сворачивать в системную панель</translation> </message> @@ -521,12 +526,17 @@ <translation>Размер шрифта</translation> </message> <message> - <location line="+11"/> + <location line="+13"/> <source>Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>Emoji Font Famly</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+33"/> <source>Theme</source> <translation>Тема</translation> </message> @@ -566,7 +576,7 @@ <translation>ГЛАВНОЕ</translation> </message> <message> - <location line="+150"/> + <location line="+156"/> <source>Open Sessions File</source> <translation>Открыть файл сеансов</translation> </message> @@ -637,6 +647,14 @@ </message> </context> <context> + <name>descriptiveTime</name> + <message> + <location filename="../../src/Utils.cpp" line="+104"/> + <source>Yesterday</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::CreateRoom</name> <message> <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/> @@ -779,7 +797,7 @@ Media size: %2 <context> <name>dialogs::ReadReceipts</name> <message> - <location filename="../../src/dialogs/ReadReceipts.cpp" line="+119"/> + <location filename="../../src/dialogs/ReadReceipts.cpp" line="+121"/> <source>Read receipts</source> <translation>Подтверждать прочтение</translation> </message> @@ -795,6 +813,19 @@ Media size: %2 </message> </context> <context> + <name>dialogs::ReceiptItem</name> + <message> + <location line="-55"/> + <source>Today %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Yesterday %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::RoomSettings</name> <message> <location filename="../../src/dialogs/RoomSettings.cpp" line="+113"/> @@ -1005,4 +1036,32 @@ Media size: %2 <translation type="unfinished"></translation> </message> </context> +<context> + <name>utils</name> + <message> + <location filename="../../src/Utils.cpp" line="+46"/> + <source>You</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+219"/> + <source>sent a file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an image.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an audio file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent a video</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> 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 @@ <context> <name>AudioItem</name> <message> - <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+117"/> + <location filename="../../src/timeline/widgets/AudioItem.cpp" line="+118"/> <source>Save File</source> <translation>保存文件</translation> </message> @@ -12,7 +12,7 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+309"/> + <location filename="../../src/ChatPage.cpp" line="+331"/> <source>Failed to upload image. Please try again.</source> <translation>上传图像失败。请重试。</translation> </message> @@ -32,7 +32,7 @@ <translation>上传视频失败。请重试。</translation> </message> <message> - <location line="+376"/> + <location line="+380"/> <source>Failed to restore OLM account. Please login again.</source> <translation>恢复 OLM 账户失败。请重新登录。</translation> </message> @@ -42,7 +42,7 @@ <translation>恢复保存的数据失败。请重新登录。</translation> </message> <message> - <location line="+169"/> + <location line="+198"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> @@ -118,7 +118,7 @@ <context> <name>FileItem</name> <message> - <location filename="../../src/timeline/widgets/FileItem.cpp" line="+106"/> + <location filename="../../src/timeline/widgets/FileItem.cpp" line="+107"/> <source>Save File</source> <translation>保存文件</translation> </message> @@ -126,7 +126,7 @@ <context> <name>ImageItem</name> <message> - <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+238"/> + <location filename="../../src/timeline/widgets/ImageItem.cpp" line="+241"/> <source>Save image</source> <translation>保存图像</translation> </message> @@ -205,8 +205,8 @@ <translation>聊天室成员</translation> </message> <message> - <location line="+33"/> - <source>ESC</source> + <location line="+4"/> + <source>OK</source> <translation type="unfinished"></translation> </message> </context> @@ -277,7 +277,7 @@ <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+2204"/> + <location filename="../../src/Cache.cpp" line="+2205"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -285,12 +285,12 @@ <context> <name>RoomInfoListItem</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+92"/> + <location filename="../../src/RoomInfoListItem.cpp" line="+93"/> <source>Leave room</source> <translation>离开聊天室</translation> </message> <message> - <location line="+174"/> + <location line="+181"/> <source>Accept</source> <translation>接受</translation> </message> @@ -331,7 +331,7 @@ <context> <name>StatusIndicator</name> <message> - <location filename="../../src/timeline/TimelineItem.cpp" line="+106"/> + <location filename="../../src/timeline/TimelineItem.cpp" line="+107"/> <source>Encrypted</source> <translation>加密的</translation> </message> @@ -354,13 +354,13 @@ <context> <name>TextInputWidget</name> <message> - <location filename="../../src/TextInputWidget.cpp" line="+506"/> + <location filename="../../src/TextInputWidget.cpp" line="+507"/> <source>Send a file</source> <translation>发送一个文件</translation> </message> <message> <location line="+13"/> - <location filename="../../src/TextInputWidget.h" line="+168"/> + <location filename="../../src/TextInputWidget.h" line="+164"/> <source>Write a message...</source> <translation>写一条消息...</translation> </message> @@ -424,7 +424,12 @@ <translation>聊天室选项</translation> </message> <message> - <location line="+28"/> + <location line="+5"/> + <source>Mentions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>Invite users</source> <translation>邀请用户</translation> </message> @@ -460,7 +465,7 @@ <context> <name>TypingDisplay</name> <message> - <location filename="../../src/TypingDisplay.cpp" line="+45"/> + <location filename="../../src/TypingDisplay.cpp" line="+46"/> <source> is typing</source> <translation> 正在打字</translation> </message> @@ -481,7 +486,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+156"/> + <location filename="../../src/UserSettingsPage.cpp" line="+166"/> <source>Minimize to tray</source> <translation>最小化至托盘</translation> </message> @@ -521,12 +526,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+13"/> <source>Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>Emoji Font Famly</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+33"/> <source>Theme</source> <translation>主题</translation> </message> @@ -566,7 +576,7 @@ <translation>通用</translation> </message> <message> - <location line="+150"/> + <location line="+156"/> <source>Open Sessions File</source> <translation>打开会话文件</translation> </message> @@ -636,6 +646,14 @@ </message> </context> <context> + <name>descriptiveTime</name> + <message> + <location filename="../../src/Utils.cpp" line="+104"/> + <source>Yesterday</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::CreateRoom</name> <message> <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/> @@ -778,7 +796,7 @@ Media size: %2 <context> <name>dialogs::ReadReceipts</name> <message> - <location filename="../../src/dialogs/ReadReceipts.cpp" line="+119"/> + <location filename="../../src/dialogs/ReadReceipts.cpp" line="+121"/> <source>Read receipts</source> <translation>阅读回执</translation> </message> @@ -794,6 +812,19 @@ Media size: %2 </message> </context> <context> + <name>dialogs::ReceiptItem</name> + <message> + <location line="-55"/> + <source>Today %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Yesterday %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>dialogs::RoomSettings</name> <message> <location filename="../../src/dialogs/RoomSettings.cpp" line="+113"/> @@ -1012,4 +1043,32 @@ Media size: %2 <translation>Flags</translation> </message> </context> +<context> + <name>utils</name> + <message> + <location filename="../../src/Utils.cpp" line="+46"/> + <source>You</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+219"/> + <source>sent a file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an image.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent an audio file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>sent a video</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> 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 <QDateTime> +#include <QLocale> #include <QPainter> #include <QPen> #include <QtGlobal> @@ -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) |