l10n daemon script 4d29b0f0ac 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-12-22 02:13:13 +00:00
..
cellularnetwork	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-22 02:13:13 +00:00
hotspot	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-22 02:13:13 +00:00
info	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-22 02:13:13 +00:00
mobileshell	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-17 02:07:26 +00:00
powermanagement	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-22 02:13:13 +00:00
time	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-22 02:13:13 +00:00
virtualkeyboard	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-22 02:13:13 +00:00
wifi	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-22 02:13:13 +00:00
CMakeLists.txt	kcms: Import mobile network kcms	2023-03-14 14:31:27 +00:00