Merge remote-tracking branch 'origin/master' into new-chat-from-contacts-7

This commit is contained in:
Sebastian Wolf 2020-11-27 21:14:59 +01:00
commit de945c7846
13 changed files with 103 additions and 1 deletions

View file

@ -1097,7 +1097,7 @@ Page {
visible: chatPage.hasSendPrivilege("can_send_media_messages") visible: chatPage.hasSendPrivilege("can_send_media_messages")
icon.source: "image://theme/icon-m-document" icon.source: "image://theme/icon-m-document"
onClicked: { onClicked: {
var picker = pageStack.push("Sailfish.Pickers.DocumentPickerPage"); var picker = pageStack.push("Sailfish.Pickers.FilePickerPage");
picker.selectedContentPropertiesChanged.connect(function(){ picker.selectedContentPropertiesChanged.connect(function(){
attachmentOptionsRow.visible = false; attachmentOptionsRow.visible = false;
Debug.log("Selected document: ", picker.selectedContentProperties.filePath ); Debug.log("Selected document: ", picker.selectedContentProperties.filePath );

View file

@ -31,6 +31,9 @@ QString FernschreiberUtils::getMessageShortText(const QVariantMap &messageConten
if (contentType == "messageAnimation") { if (contentType == "messageAnimation") {
return myself ? tr("sent an animation", "myself") : tr("sent an animation"); return myself ? tr("sent an animation", "myself") : tr("sent an animation");
} }
if (contentType == "messageAudio") {
return myself ? tr("sent an audio", "myself") : tr("sent an audio");
}
if (contentType == "messageVoiceNote") { if (contentType == "messageVoiceNote") {
return myself ? tr("sent a voice note", "myself") : tr("sent a voice note"); return myself ? tr("sent a voice note", "myself") : tr("sent a voice note");
} }

View file

@ -756,6 +756,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation>hat ein selbstzerstörendes Bild gesendet, das abgelaufen ist</translation> <translation>hat ein selbstzerstörendes Bild gesendet, das abgelaufen ist</translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation>haben eine Audiodatei gesendet</translation>
</message>
<message>
<source>sent an audio</source>
<translation>hat eine Audiodatei gesendet</translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>

View file

@ -756,6 +756,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation>sent a self-destructing photo that is expired</translation> <translation>sent a self-destructing photo that is expired</translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation>sent an audio</translation>
</message>
<message>
<source>sent an audio</source>
<translation>sent an audio</translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>

View file

@ -746,6 +746,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation>envió un foto autodestructivo que está caducado</translation> <translation>envió un foto autodestructivo que está caducado</translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation type="unfinished">envió un audio</translation>
</message>
<message>
<source>sent an audio</source>
<translation type="unfinished">envió un audio</translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>

View file

@ -757,6 +757,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation>lähetti itsetuhoutuvan kuvan joka vanheni</translation> <translation>lähetti itsetuhoutuvan kuvan joka vanheni</translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>sent an audio</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>

View file

@ -746,6 +746,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation type="unfinished">audiót küldött</translation>
</message>
<message>
<source>sent an audio</source>
<translation type="unfinished">audiót küldött</translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>

View file

@ -756,6 +756,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation>ha inviato una foto effimera già scaduta</translation> <translation>ha inviato una foto effimera già scaduta</translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>sent an audio</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>

View file

@ -766,6 +766,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>sent an audio</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>

View file

@ -766,6 +766,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation type="unfinished">отправил(а) аудио</translation>
</message>
<message>
<source>sent an audio</source>
<translation type="unfinished">отправил(а) аудио</translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>

View file

@ -756,6 +756,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation>skickade ett självförstörande foto som är utgånget</translation> <translation>skickade ett självförstörande foto som är utgånget</translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation type="unfinished">skickade en ljudfil</translation>
</message>
<message>
<source>sent an audio</source>
<translation type="unfinished">skickade en ljudfil</translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>

View file

@ -746,6 +746,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>sent an audio</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>

View file

@ -756,6 +756,15 @@
<source>sent a self-destructing photo that is expired</source> <source>sent a self-destructing photo that is expired</source>
<translation>sent a self-destructing photo that is expired</translation> <translation>sent a self-destructing photo that is expired</translation>
</message> </message>
<message>
<source>sent an audio</source>
<comment>myself</comment>
<translation type="unfinished">sent an audio</translation>
</message>
<message>
<source>sent an audio</source>
<translation type="unfinished">sent an audio</translation>
</message>
</context> </context>
<context> <context>
<name>ImagePage</name> <name>ImagePage</name>