l10n daemon script df4030f3fb 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"		2023-11-29 03:05:10 +00:00
..
qml	Improve/change "Pair" i18n messages	2023-07-23 16:13:45 +02:00
CMakeLists.txt	Add setting page and expose about data info	2022-12-14 16:46:57 +00:00
main.cpp	clang-format pass	2023-07-16 16:20:34 +02:00
Messages.sh	Fix localization of app and smsapp. Patch mainly by Victor Ryzhykh.	2019-12-21 09:59:36 +02:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-11-29 03:05:10 +00:00
resources.qrc	Fix setting page sometimes not visible when clicking on it	2022-12-14 16:46:57 +00:00