shift-shell/quicksettings
l10n daemon script 17a86b7882 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-04-02 02:23:08 +00:00
..
airplanemode SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-02 02:23:08 +00:00
audio SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-23 02:52:45 +00:00
battery SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-23 02:52:45 +00:00
bluetooth SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-23 02:52:45 +00:00
caffeine quicksettings: Extract out from mobileshell into separate plugin 2023-03-16 19:44:36 -07:00
docked SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-02 02:23:08 +00:00
donotdisturb SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-01 02:26:14 +00:00
flashlight quicksettings: Add docked/convergence quick setting 2023-03-29 19:41:10 -07:00
hotspot SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-23 02:52:45 +00:00
keyboardtoggle SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-01 02:26:14 +00:00
mobiledata SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-23 02:52:45 +00:00
nightcolor Link to QtQml/QtQuick instead of KDeclarative targets 2023-03-21 11:30:17 +00:00
powermenu Link to QtQml/QtQuick instead of KDeclarative targets 2023-03-21 11:30:17 +00:00
record Link to QtQml/QtQuick instead of KDeclarative targets 2023-03-21 11:30:17 +00:00
screenrotation SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-23 02:52:45 +00:00
screenshot SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-23 02:52:45 +00:00
settingsapp SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-23 02:52:45 +00:00
wifi SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-23 02:52:45 +00:00
CMakeLists.txt quicksettings: Add docked/convergence quick setting 2023-03-29 19:41:10 -07:00