shift-shell/quicksettings
l10n daemon script 518b94e018 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-06-28 01:25:09 +00:00
..
airplanemode SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
audio SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
battery SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
bluetooth SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
caffeine SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
docked SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
donotdisturb SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
flashlight SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
hotspot SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
keyboardtoggle SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
mobiledata SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
nightcolor SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
powermenu SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
record SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
screenrotation SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
screenshot SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
settingsapp SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
wifi SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-28 01:25:09 +00:00
CMakeLists.txt quicksetting/record: Disable for now 2023-12-08 19:17:07 -08:00