Merge branch '0.7.0-dev' of github.com:Nheko-Reborn/nheko into 0.7.0-dev
Fix merge conflicts with weblate translation files.
No related branches found
No related tags found
Showing
- resources/langs/nheko_de.ts 115 additions, 42 deletionsresources/langs/nheko_de.ts
- resources/langs/nheko_el.ts 117 additions, 44 deletionsresources/langs/nheko_el.ts
- resources/langs/nheko_en.ts 115 additions, 42 deletionsresources/langs/nheko_en.ts
- resources/langs/nheko_fi.ts 115 additions, 42 deletionsresources/langs/nheko_fi.ts
- resources/langs/nheko_fr.ts 117 additions, 44 deletionsresources/langs/nheko_fr.ts
- resources/langs/nheko_nl.ts 117 additions, 44 deletionsresources/langs/nheko_nl.ts
- resources/langs/nheko_pl.ts 120 additions, 46 deletionsresources/langs/nheko_pl.ts
- resources/langs/nheko_ru.ts 122 additions, 48 deletionsresources/langs/nheko_ru.ts
- resources/langs/nheko_zh_CN.ts 118 additions, 46 deletionsresources/langs/nheko_zh_CN.ts
- src/TypingDisplay.cpp 11 additions, 6 deletionssrc/TypingDisplay.cpp
- src/Utils.cpp 10 additions, 10 deletionssrc/Utils.cpp
- src/dialogs/MemberList.cpp 2 additions, 2 deletionssrc/dialogs/MemberList.cpp
- src/dialogs/ReadReceipts.cpp 8 additions, 6 deletionssrc/dialogs/ReadReceipts.cpp
- src/dialogs/RoomSettings.cpp 3 additions, 3 deletionssrc/dialogs/RoomSettings.cpp
- src/dialogs/UserProfile.cpp 1 addition, 1 deletionsrc/dialogs/UserProfile.cpp
- src/timeline/TimelineItem.cpp 13 additions, 1 deletionsrc/timeline/TimelineItem.cpp
- src/timeline/TimelineItem.h 1 addition, 1 deletionsrc/timeline/TimelineItem.h
- src/timeline/TimelineView.cpp 23 additions, 5 deletionssrc/timeline/TimelineView.cpp
- src/ui/InfoMessage.cpp 7 additions, 6 deletionssrc/ui/InfoMessage.cpp
Loading
Please register or sign in to comment