l10n daemon script a2d8105d08 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"		2024-11-08 01:25:01 +00:00
..
cellularnetwork	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-11-08 01:25:01 +00:00
hotspot	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-10-10 01:23:11 +00:00
info	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-10-11 01:26:14 +00:00
mobileshell	[mobileshell kcm]: option to control status bar scale	2024-10-25 17:53:25 +00:00
powermanagement	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-10-11 01:26:14 +00:00
time	kcms/time: Fix layout of time dialog and port date dialog to DatePopup	2024-11-04 20:34:57 -08:00
virtualkeyboard	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-11-08 01:25:01 +00:00
wifi	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-10-28 01:24:44 +00:00
CMakeLists.txt	kcms: Import mobile network kcms	2023-03-14 14:31:27 +00:00