shift-shell/quicksettings
l10n daemon script 6364578281 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"
2022-08-04 01:46:56 +00:00
..
airplanemode SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
audio SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
battery SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
bluetooth SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
caffeine SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
flashlight SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
keyboardtoggle SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
location SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
mobiledata SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
nightcolor SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
powermenu SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
record SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
screenrotation SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
screenshot SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
settingsapp SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
wifi SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-04 01:46:56 +00:00
CMakeLists.txt Add a Record QuickSetting 2022-05-30 00:07:52 +00:00