Merge branch 'upstream'

This commit is contained in:
molan-git 2020-05-11 10:03:18 +02:00
commit 02109021e5
5 changed files with 23 additions and 23 deletions

View file

@ -57,10 +57,10 @@ Page {
console.log(playbackState) console.log(playbackState)
switch (playbackState){ switch (playbackState){
case MediaPlayer.PlayingState: case MediaPlayer.PlayingState:
playerIcon.icon.source = "image://theme/icon-m-play" playerIcon.icon.source = "image://theme/icon-m-pause"
return; return;
case MediaPlayer.PausedState: case MediaPlayer.PausedState:
playerIcon.icon.source = "image://theme/icon-m-pause" playerIcon.icon.source = "image://theme/icon-m-play"
return; return;
case MediaPlayer.StoppedState: case MediaPlayer.StoppedState:
playerIcon.icon.source = "image://theme/icon-m-stop" playerIcon.icon.source = "image://theme/icon-m-stop"

View file

@ -170,7 +170,7 @@ BackgroundItem {
} }
text: content text: content
textFormat: Text.StyledText textFormat: Text.RichText
linkColor : Theme.highlightColor linkColor : Theme.highlightColor
wrapMode: Text.Wrap wrapMode: Text.Wrap
maximumLineCount: 6 maximumLineCount: 6

View file

@ -145,8 +145,8 @@ BackgroundItem {
text: content.replace(new RegExp("<a ", 'g'), '<a style="text-decoration: none; color:'+(pressed ? Theme.secondaryColor : Theme.highlightColor)+'" ') text: content.replace(new RegExp("<a ", 'g'), '<a style="text-decoration: none; color:'+(pressed ? Theme.secondaryColor : Theme.highlightColor)+'" ')
linkColor : Theme.highlightColor linkColor : Theme.highlightColor
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
textFormat: Text.StyledText textFormat: Text.RichText
font.pixelSize: Theme.fontSizeExtraSmall font.pixelSize: Theme.fontSizeSmall
color: (pressed ? Theme.highlightColor : (!highlight ? Theme.primaryColor : Theme.secondaryColor)) color: (pressed ? Theme.highlightColor : (!highlight ? Theme.primaryColor : Theme.secondaryColor))
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent

View file

@ -40,7 +40,7 @@
</message> </message>
<message> <message>
<source>Write your warning here</source> <source>Write your warning here</source>
<translation>Avertissement du contenu</translation> <translation>Rédigez votre alerte ici</translation>
</message> </message>
<message> <message>
<source>Public</source> <source>Public</source>
@ -81,7 +81,7 @@
<name>LoginPage</name> <name>LoginPage</name>
<message> <message>
<source>Login</source> <source>Login</source>
<translation>Login</translation> <translation>Connexion</translation>
</message> </message>
<message> <message>
<source>Instance</source> <source>Instance</source>
@ -93,7 +93,7 @@
</message> </message>
<message> <message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source> <source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon est un réseau libre et open source. Il sagit d&apos;une alternative aux plateformes commerciales, pour éviter qu&apos;une seule entreprise monopolise vos communications. Choisissez un serveur dans lequel vous avez confiance - quelque que soit votre choix vous pourrez interagir avec dautres personnes. Tout le monde peut monter sa propre instance Mastodon et participer rendre le réseau plus robuste.</translation> <translation>Mastodon est un réseau libre et open source : une alternative décentralisée aux plateformes commerciales, afin déviter le contrôle monopolistique de vos communications par une entreprise. Choisissez un serveur dans lequel vous avez confiance - quelque que soit votre choix vous pourrez interagir avec tous les utilisateurs du réseau Mastodon. Tout le monde peut monter sa propre instance Mastodon et ainsi contribuer à la croissance du réseau.</translation>
</message> </message>
<message> <message>
<source>Reload</source> <source>Reload</source>
@ -116,7 +116,7 @@
</message> </message>
<message> <message>
<source>Search</source> <source>Search</source>
<translation>Chercher</translation> <translation>Rechercher</translation>
</message> </message>
<message> <message>
<source>@user or #term</source> <source>@user or #term</source>
@ -173,7 +173,7 @@
</message> </message>
<message> <message>
<source>Follow request sent!</source> <source>Follow request sent!</source>
<translation>Demande de suivi envoyée !</translation> <translation>Demande dabonnement envoyée !</translation>
</message> </message>
<message> <message>
<source>Following</source> <source>Following</source>
@ -232,7 +232,7 @@
</message> </message>
<message> <message>
<source>Remove Account</source> <source>Remove Account</source>
<translation>Enlever compte</translation> <translation>Déconnecter votre compte</translation>
</message> </message>
<message> <message>
<source>Add Account</source> <source>Add Account</source>
@ -244,7 +244,7 @@
</message> </message>
<message> <message>
<source>Authorize this app to access your Mastodon account</source> <source>Authorize this app to access your Mastodon account</source>
<translation>Autoriser cette application d&apos;utiliser votre compte</translation> <translation>Autoriser laccès à votre compte pour cette application</translation>
</message> </message>
<message> <message>
<source>Disable this option if you want to preserve your data connection</source> <source>Disable this option if you want to preserve your data connection</source>
@ -280,7 +280,7 @@
</message> </message>
<message> <message>
<source>Added README file</source> <source>Added README file</source>
<translation>Ajouté fichier README</translation> <translation>Fichier README ajouté</translation>
</message> </message>
<message> <message>
<source>Load images in toots</source> <source>Load images in toots</source>
@ -292,7 +292,7 @@
</message> </message>
<message> <message>
<source>Use Transifex to help with app translation to your language</source> <source>Use Transifex to help with app translation to your language</source>
<translation>Utiliser Transifex pour aider avec les traductions de l&apos;application</translation> <translation>Utiliser Transifex pour aider à traduire cette application</translation>
</message> </message>
<message> <message>
<source>Development and translations</source> <source>Development and translations</source>
@ -326,11 +326,11 @@
</message> </message>
<message> <message>
<source>Unfavorite</source> <source>Unfavorite</source>
<translation>Défavoriser</translation> <translation>Retirer des favoris</translation>
</message> </message>
<message> <message>
<source>Favorite</source> <source>Favorite</source>
<translation>Ajouter au favoris</translation> <translation>Ajouter aux favoris</translation>
</message> </message>
</context> </context>
</TS> </TS>

View file

@ -43,37 +43,37 @@
<translation>A cosa stai pensando?</translation> <translation>A cosa stai pensando?</translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/Conversation.qml" line="276"/> <location filename="../qml/pages/Conversation.qml" line="275"/>
<source>Delete</source> <source>Delete</source>
<translation>Elimina</translation> <translation>Elimina</translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/Conversation.qml" line="376"/> <location filename="../qml/pages/Conversation.qml" line="373"/>
<source>Public</source> <source>Public</source>
<translation>Pubblico</translation> <translation>Pubblico</translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/Conversation.qml" line="379"/> <location filename="../qml/pages/Conversation.qml" line="376"/>
<source>Unlisted</source> <source>Unlisted</source>
<translation>Non elencato</translation> <translation>Non elencato</translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/Conversation.qml" line="382"/> <location filename="../qml/pages/Conversation.qml" line="379"/>
<source>Followers-only</source> <source>Followers-only</source>
<translation>Solo ai seguaci</translation> <translation>Solo ai seguaci</translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/Conversation.qml" line="385"/> <location filename="../qml/pages/Conversation.qml" line="382"/>
<source>Direct</source> <source>Direct</source>
<translation>Diretto</translation> <translation>Diretto</translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/Conversation.qml" line="499"/> <location filename="../qml/pages/Conversation.qml" line="496"/>
<source>Emojis</source> <source>Emojis</source>
<translation>Emojis</translation> <translation>Emojis</translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/Conversation.qml" line="500"/> <location filename="../qml/pages/Conversation.qml" line="497"/>1
<source>Tap to insert</source> <source>Tap to insert</source>
<translation>Tap per inserire</translation> <translation>Tap per inserire</translation>
</message> </message>