SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

CMakeLists.txt

@@ -28,7 +28,7 @@ endif()
 # Fix a crash due to problems with quotient's event system. Can probably be removed once the reworked event system is in
 cmake_policy(SET CMP0063 OLD)
 
-ecm_setup_version(1.1.0
+ecm_setup_version(1.1.1
     VARIABLE_PREFIX NEOCHAT
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )

imports/NeoChat/Page/JoinRoomPage.qml

@@ -111,8 +111,8 @@ Kirigami.ScrollablePage {
             }
             contentItem: RowLayout {
                 Kirigami.Avatar {
-                    Layout.preferredWidth: Kirigami.Units.iconSizes.huge
+                    Layout.preferredWidth: Kirigami.Units.iconSizes.normal
-                    Layout.preferredHeight: Kirigami.Units.iconSizes.huge
+                    Layout.preferredHeight: Kirigami.Units.iconSizes.normal
 
                     source: model.avatar ? ("image://mxc/" + model.avatar) : ""
                     name: name

imports/NeoChat/Page/RoomPage.qml

@@ -187,7 +187,7 @@ Kirigami.ScrollablePage {
                     onClicked: {
                         attachDialog.close()
 
-                        var fileDialog = openFileDialog.createObject(ApplicationWindow.overlay)
+                        var fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.overlay)
 
                         fileDialog.chosen.connect(function(path) {
                             if (!path) return

imports/NeoChat/Page/SettingsPage.qml

@@ -17,7 +17,7 @@ Kirigami.ScrollablePage {
 
     Kirigami.FormLayout {
         QQC2.CheckBox {
-            Kirigami.FormData.label: i18nc("General settings:")
+            Kirigami.FormData.label: i18n("General settings:")
             text: i18n("Close to system tray")
             checked: Config.systemTray
             onToggled: {

neochat.notifyrc

@@ -3,6 +3,7 @@ IconName=org.kde.neochat
 Name=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[cs]=Neochat
 Name[da]=Neochat
 Name[de]=Neochat
 Name[en_GB]=Neochat
@@ -11,12 +12,14 @@ Name[eu]=Neochat
 Name[fi]=Neochat
 Name[fr]=Neochat
 Name[hu]=Neochat
+Name[ia]=Neochat
 Name[it]=Neochat
 Name[nl]=Neochat
 Name[nn]=Neochat
 Name[pl]=Neochat
 Name[pt]=Neochat
 Name[pt_BR]=Neochat
+Name[ro]=Neochat
 Name[sk]=Neochat
 Name[sl]=Neochat
 Name[sv]=Neochat
@@ -26,24 +29,32 @@ Name[zh_CN]=Neochat
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
 Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat
+Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat
+Comment[de]=Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll
 Comment[en_GB]=A client for matrix, the decentralised communication protocol
 Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
+Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat
 Comment[fi]=Hajautetun Matrix-viestintäyhteyskäytännön asiakasohjelma
 Comment[fr]=Un client pour « Matrix », le protocole décentralisé de communications.
+Comment[ia]=Un cliente per matrix, le protocollo de communication decentralisate
 Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato
 Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
 Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
 Comment[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewania się
 Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado
+Comment[ro]=Client pentru Matrix, protocolul de comunicare descentralizată
+Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix
 Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet
 Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними
 Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx
+Comment[zh_CN]=分布式通讯协议 Matrix 的客户端
 
 
 [Event/message]
 Name=New message
 Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
+Name[cs]=Nová zpráva
 Name[de]=Neue Nachricht
 Name[en_GB]=New message
 Name[es]=Nuevo mensaje
@@ -51,12 +62,14 @@ Name[eu]=Mezu berria
 Name[fi]=Uusi viesti
 Name[fr]=Nouveau message
 Name[hu]=Új üzenet
+Name[ia]=Nove message
 Name[it]=Nuovo messaggio
 Name[nl]=Nieuw bericht
 Name[nn]=Ny melding
 Name[pl]=Nowa wiadomość
 Name[pt]=Nova mensagem
 Name[pt_BR]=Nova mensagem
+Name[ro]=Mesaj nou
 Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
@@ -73,12 +86,14 @@ Comment[eu]=Mezu berri bat dago
 Comment[fi]=Saapui uusi viesti
 Comment[fr]=Il y a un nouveau message
 Comment[hu]=Új üzenet érkezett
+Comment[ia]=Isto es un nove message
 Comment[it]=È presente un nuovo messaggio
 Comment[nl]=Er is een nieuw bericht
 Comment[nn]=Du har ei ny melding
 Comment[pl]=Dostępna jest nowa wiadomość
 Comment[pt]=Tem uma mensagem nova
 Comment[pt_BR]=Existe uma nova mensagem
+Comment[ro]=Este un mesaj nou
 Comment[sk]=Je nová správa
 Comment[sl]=Prišlo je novo sporočilo
 Comment[sv]=Det finns ett nytt meddelande

org.kde.neochat.appdata.xml

@@ -7,6 +7,7 @@
   <name>Neochat</name>
   <name xml:lang="ca">Neochat</name>
   <name xml:lang="ca-valencia">Neochat</name>
+  <name xml:lang="cs">Neochat</name>
   <name xml:lang="da">Neochat</name>
   <name xml:lang="de">Neochat</name>
   <name xml:lang="en-GB">Neochat</name>
@@ -15,6 +16,7 @@
   <name xml:lang="fi">Neochat</name>
   <name xml:lang="fr">Neochat</name>
   <name xml:lang="hu">Neochat</name>
+  <name xml:lang="ia">Neochat</name>
   <name xml:lang="id">Neochat</name>
   <name xml:lang="it">Neochat</name>
   <name xml:lang="nl">Neochat</name>
@@ -30,6 +32,7 @@
   <summary>A client for matrix, the decentralized communication protocol</summary>
   <summary xml:lang="ca">Un client per al Matrix, el protocol de comunicacions descentralitzat</summary>
   <summary xml:lang="ca-valencia">Un client per al Matrix, el protocol de comunicacions descentralitzat</summary>
+  <summary xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix</summary>
   <summary xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll</summary>
   <summary xml:lang="en-GB">A client for matrix, the decentralised communication protocol</summary>
   <summary xml:lang="es">Un cliente para Matrix, el protocolo de comunicaciones descentralizado</summary>
@@ -37,6 +40,7 @@
   <summary xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle</summary>
   <summary xml:lang="fr">Un client pour « Matrix », le protocole décentralisé de communications.</summary>
   <summary xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz</summary>
+  <summary xml:lang="ia">Un cliente per matrix, le protocollo de communication decentralisate</summary>
   <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
   <summary xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato</summary>
   <summary xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol</summary>
@@ -53,6 +57,7 @@
     <p>A client for matrix, the decentralized communication protocol.</p>
     <p xml:lang="ca">Un client per al Matrix, el protocol de comunicacions descentralitzat.</p>
     <p xml:lang="ca-valencia">Un client per al Matrix, el protocol de comunicacions descentralitzat.</p>
+    <p xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix.</p>
     <p xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll.</p>
     <p xml:lang="en-GB">A client for matrix, the decentralised communication protocol.</p>
     <p xml:lang="es">Un cliente para Matrix, el protocolo de comunicaciones descentralizado.</p>
@@ -60,6 +65,7 @@
     <p xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle.</p>
     <p xml:lang="fr">Un client « Matrix », le protocole décentralisé de communications.</p>
     <p xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz.</p>
+    <p xml:lang="ia">Un cliente per matrix, le protocollo de communication decentralisate.</p>
     <p xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi.</p>
     <p xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato.</p>
     <p xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol.</p>
@@ -81,6 +87,7 @@
   <developer_name>The KDE Community</developer_name>
   <developer_name xml:lang="ca">La comunitat KDE</developer_name>
   <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
+  <developer_name xml:lang="cs">Komunita KDE</developer_name>
   <developer_name xml:lang="de">Die KDE-Gemeinschaft</developer_name>
   <developer_name xml:lang="en-GB">The KDE Community</developer_name>
   <developer_name xml:lang="es">La comunidad KDE</developer_name>
@@ -88,6 +95,7 @@
   <developer_name xml:lang="fi">KDE-yhteisö</developer_name>
   <developer_name xml:lang="fr">La communauté de KDE</developer_name>
   <developer_name xml:lang="hu">A KDE Közösség</developer_name>
+  <developer_name xml:lang="ia">Le communitate de KDE</developer_name>
   <developer_name xml:lang="id">Komunitas KDE</developer_name>
   <developer_name xml:lang="it">La comunità KDE</developer_name>
   <developer_name xml:lang="nl">De KDE gemeenschap</developer_name>
@@ -115,6 +123,7 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release urgency="critical" version="1.1.1" date="2021-02-23"/>
     <release version="1.1.0" date="2021-02-22">
       <description>
         <p>Probably the highlight of this release is the completely new login page. It detects the server configuration based on your Matrix Id. This allows you to login to servers requiring Single Sign On (SSO) (like the Mozilla or the incoming Fedora Matrix instance).</p>

org.kde.neochat.desktop

@@ -2,6 +2,7 @@
 Name=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[cs]=Neochat
 Name[da]=Neochat
 Name[de]=Neochat
 Name[en_GB]=Neochat
@@ -10,12 +11,14 @@ Name[eu]=Neochat
 Name[fi]=Neochat
 Name[fr]=Neochat
 Name[hu]=Neochat
+Name[ia]=Neochat
 Name[it]=Neochat
 Name[nl]=Neochat
 Name[nn]=Neochat
 Name[pl]=Neochat
 Name[pt]=Neochat
 Name[pt_BR]=Neochat
+Name[ro]=Neochat
 Name[sk]=Neochat
 Name[sl]=Neochat
 Name[sv]=Neochat
@@ -25,6 +28,7 @@ Name[zh_CN]=Neochat
 GenericName=Matrix Client
 GenericName[ca]=Client del Matrix
 GenericName[ca@valencia]=Client del Matrix
+GenericName[cs]=Klient protokolu Matrix
 GenericName[de]=Matrix-Programm
 GenericName[en_GB]=Matrix Client
 GenericName[es]=Cliente para Matrix
@@ -32,12 +36,14 @@ GenericName[eu]=Matrix bezeroa
 GenericName[fi]=Matrix-asiakas
 GenericName[fr]=Client « Matrix »
 GenericName[hu]=Matrix kliens
+GenericName[ia]=Cliente de Matrix
 GenericName[it]=Client Matrix
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
 GenericName[pl]=Program Matriksa
 GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
+GenericName[ro]=Client Matrix
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
@@ -54,12 +60,14 @@ Comment[eu]=Matrix protokolorako bezeroa
 Comment[fi]=Asiakas Matrix-yhteyskäytännölle
 Comment[fr]=Client pour le protocole « Matrix »
 Comment[hu]=Kliens a Matrix protokollhoz
+Comment[ia]=Cliente per le protocollo de Matrix
 Comment[it]=Client per il protocollo Matrix
 Comment[nl]=Client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
 Comment[pl]=Program obsługi protokołu Matriksa
 Comment[pt]=Cliente para o protocolo Matrix
 Comment[pt_BR]=Cliente para o protocolo Matrix
+Comment[ro]=Client pentru protocolul Matrix
 Comment[sk]=Klient protokolu Matrix
 Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix

src/messageeventmodel.cpp

@@ -11,10 +11,11 @@
 #include <events/redactionevent.h>
 #include <events/roomavatarevent.h>
 #include <events/roommemberevent.h>
-#include <events/stickerevent.h>
 #include <events/simplestateevents.h>
 #include <user.h>
 
+#include "stickerevent.h"
+
 #include <QDebug>
 #include <QQmlEngine> // for qmlRegisterType()
 #include <QTimeZone>

src/neochatroom.cpp

@@ -27,7 +27,7 @@
 #include "events/roomcanonicalaliasevent.h"
 #include "events/roommessageevent.h"
 #include "events/roompowerlevelsevent.h"
-#include "events/stickerevent.h"
+#include "stickerevent.h"
 #include "events/typingevent.h"
 #include "jobs/downloadfilejob.h"
 #include "neochatconfig.h"