shift-shell/quicksettings
l10n daemon script c2474b385e 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-03-19 01:43:02 +00:00
..
airplanemode SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
audio SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
battery SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
bluetooth SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
caffeine quicksettings: Ensure package ids don't conflict with existing applets 2022-03-17 15:57:40 -04:00
flashlight SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
keyboardtoggle quicksettings: Ensure package ids don't conflict with existing applets 2022-03-17 15:57:40 -04:00
location SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
mobiledata SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
nightcolor quicksettings: Ensure package ids don't conflict with existing applets 2022-03-17 15:57:40 -04:00
powermenu SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
screenrotation SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
screenshot SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
settingsapp SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
wifi SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
CMakeLists.txt quicksettings: Ensure package ids don't conflict with existing applets 2022-03-17 15:57:40 -04:00