Merge branch 'master' of github.com:Wunderfitz/harbour-fernschreiber

This commit is contained in:
Sebastian Wolf 2021-01-02 20:07:23 +01:00
commit e620c41e17
No known key found for this signature in database
GPG key ID: CEA9522B5F38A90A
4 changed files with 7 additions and 7 deletions

View file

@ -444,7 +444,7 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: positionText.top anchors.bottom: positionText.top
minimumValue: 0 minimumValue: 0
maximumValue: messageAudio.duration ? messageAudio.duration : 0 maximumValue: messageAudio.duration ? messageAudio.duration : 0.1
stepSize: 1 stepSize: 1
value: messageAudio.position value: messageAudio.position
enabled: messageAudio.seekable enabled: messageAudio.seekable

View file

@ -482,7 +482,7 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: positionText.top anchors.bottom: positionText.top
minimumValue: 0 minimumValue: 0
maximumValue: messageVideo.duration ? messageVideo.duration : 0 maximumValue: messageVideo.duration ? messageVideo.duration : 0.1
highlighted: videoMessageComponent.highlighted || down highlighted: videoMessageComponent.highlighted || down
stepSize: 1 stepSize: 1

View file

@ -459,7 +459,7 @@ Page {
Debug.log("[ChatPage] Received pinned message"); Debug.log("[ChatPage] Received pinned message");
pinnedMessageItem.pinnedMessage = message; pinnedMessageItem.pinnedMessage = message;
} }
if (messageId === chatInformation.draft_message.reply_to_message_id) { if (chatInformation.draft_message && messageId === chatInformation.draft_message.reply_to_message_id) {
newMessageInReplyToRow.inReplyToMessage = message; newMessageInReplyToRow.inReplyToMessage = message;
} }
} }

View file

@ -1279,13 +1279,13 @@
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>%1 members</source> <source>%1 members</source>
<translation type="unfinished"> <translation>
<numerusform>%1 miembros</numerusform> <numerusform>%1 miembros</numerusform>
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>%1 subscribers</source> <source>%1 subscribers</source>
<translation type="unfinished"> <translation>
<numerusform>%1 suscriptores</numerusform> <numerusform>%1 suscriptores</numerusform>
</translation> </translation>
</message> </message>
@ -1378,11 +1378,11 @@
</message> </message>
<message> <message>
<source>Focus text input area after send</source> <source>Focus text input area after send</source>
<translation type="unfinished"></translation> <translation>Enfocar el área de entrada de texto después de enviar</translation>
</message> </message>
<message> <message>
<source>Focus the text input area after sending a message</source> <source>Focus the text input area after sending a message</source>
<translation type="unfinished"></translation> <translation>Enfocar el área de entrada de texto después de enviar un mensaje</translation>
</message> </message>
</context> </context>
<context> <context>