shift-shell/quicksettings
l10n daemon script 06f7460c15 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-05-28 02:34:37 +00:00
..
airplanemode SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-09 02:28:58 +00:00
audio SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
battery SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
bluetooth SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-21 02:19:12 +00:00
caffeine SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
docked SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-28 02:34:37 +00:00
donotdisturb SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
flashlight SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
hotspot SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-23 03:30:47 +00:00
keyboardtoggle SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
mobiledata SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
nightcolor SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-09 02:28:58 +00:00
powermenu SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
record SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-09 02:28:58 +00:00
screenrotation SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
screenshot SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
settingsapp SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-21 02:19:12 +00:00
wifi SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-21 02:19:12 +00:00
CMakeLists.txt quicksettings: Add docked/convergence quick setting 2023-03-29 19:41:10 -07:00