Made merge compatible with master

io.github.NhekoReborn.Nheko.json

resources/langs/nheko_de.ts

resources/langs/nheko_el.ts

resources/langs/nheko_en.ts

resources/langs/nheko_fi.ts

resources/langs/nheko_fr.ts

resources/langs/nheko_ja.ts

resources/langs/nheko_nl.ts

resources/langs/nheko_pl.ts

resources/langs/nheko_ru.ts

resources/langs/nheko_zh_CN.ts

resources/qml/Avatar.qml

resources/qml/TimelineRow.qml

resources/qml/TimelineView.qml

resources/qml/delegates/ImageMessage.qml

src/ChatPage.cpp

src/UserSettingsPage.cpp

src/UserSettingsPage.h

src/timeline/TimelineModel.cpp