l10n daemon script
|
46ace5ee36
|
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-01-28 02:04:50 +00:00 |
|
David Redondo
|
750d5581ef
|
Revert "Show all headers in qtc6"
There was no consensus for this in Plasma.
This reverts commit c79ca828f3.
|
2023-01-24 08:51:18 +01:00 |
|
Laurent Montel
|
c79ca828f3
|
Show all headers in qtc6
|
2023-01-22 18:30:45 +00:00 |
|
l10n daemon script
|
45cdc532f3
|
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-01-22 02:02:20 +00:00 |
|
Fabian Vogt
|
7a9565ff7e
|
Record quicksettings: Move metadata.json to right location
It needs to be next to contents/, not inside.
|
2023-01-19 18:33:02 +01:00 |
|
l10n daemon script
|
491848aca9
|
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-01-16 02:01:50 +00:00 |
|
l10n daemon script
|
64b32ea3d0
|
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-01-10 02:00:34 +00:00 |
|
l10n daemon script
|
e2ace4e65c
|
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-01-09 02:00:52 +00:00 |
|
l10n daemon script
|
a1da4b2925
|
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-01-06 01:59:48 +00:00 |
|
l10n daemon script
|
e88082caf0
|
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-01-05 02:01:35 +00:00 |
|
l10n daemon script
|
16ddca773b
|
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-01-04 02:04:03 +00:00 |
|
Devin Lin
|
fdf1d739bd
|
Ensure that package descriptions specify that they are for Plasma Mobile
Since these packages can appear in Discover and confuse users about what they are for.
|
2023-01-02 22:37:17 -05:00 |
|
l10n daemon script
|
119e750d9c
|
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-12-30 09:50:10 +00:00 |
|
l10n daemon script
|
bb04c01c68
|
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-12-22 01:53:41 +00:00 |
|
l10n daemon script
|
fe1a7e5f7c
|
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-12-21 01:55:48 +00:00 |
|
Devin Lin
|
6b843da34b
|
Ensure all packages have translations enabled
|
2022-12-19 12:39:51 -05:00 |
|
Devin Lin
|
08e8435603
|
quicksettings: Remove location quicksettings
It doesn't have any functionality, and we don't have a path forward right now for determining how to toggle GPS hardware
|
2022-11-23 19:48:53 -05:00 |
|
l10n daemon script
|
1fec8612dc
|
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-11-20 01:50:06 +00:00 |
|
Devin Lin
|
7d3bf39750
|
mobileshell: Refactor and extract state to mobileshellstate plugin
This avoids mixing plasmashell state with our MobileShell component library (which really shouldn't have state at all).
|
2022-11-12 11:15:36 -05:00 |
|
Devin Lin
|
ca671e1992
|
mmplugin: Cleanup signals
|
2022-10-23 15:33:47 -04:00 |
|
l10n daemon script
|
68dfdefbda
|
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-10-20 02:06:33 +00:00 |
|
l10n daemon script
|
990e0b61b6
|
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-10-18 01:48:38 +00:00 |
|
l10n daemon script
|
c387884cca
|
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-10-16 01:57:45 +00:00 |
|
l10n daemon script
|
871a69824f
|
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-10-15 01:50:20 +00:00 |
|
Devin Lin
|
c2b9a06e61
|
quicksettings/record: Fix
|
2022-10-12 12:06:11 -04:00 |
|
Devin Lin
|
8c885bc699
|
quicksettings/record: Move record functions out of shellutil
|
2022-10-12 12:00:12 -04:00 |
|
l10n daemon script
|
cbcfa9fd7f
|
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-10-04 01:51:11 +00:00 |
|
l10n daemon script
|
fd5eb22a09
|
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-09-25 01:47:37 +00:00 |
|
l10n daemon script
|
9d7881f3c9
|
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-09-24 01:48:25 +00:00 |
|
l10n daemon script
|
e11f31f48d
|
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-09-20 01:50:04 +00:00 |
|
l10n daemon script
|
9b692c6ef6
|
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-09-19 01:47:55 +00:00 |
|
l10n daemon script
|
76e63f7000
|
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-09-16 01:46:01 +00:00 |
|
l10n daemon script
|
3a9b60f350
|
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-09-13 01:46:19 +00:00 |
|
Devin Lin
|
31cb248a8a
|
mmplugin: Add support for checking if a SIM is missing
|
2022-09-12 16:36:19 -04:00 |
|
l10n daemon script
|
336f35a235
|
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-09-12 01:44:01 +00:00 |
|
l10n daemon script
|
201ba6959d
|
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-09-11 01:44:12 +00:00 |
|
Devin Lin
|
419de3fbe7
|
quicksettings/nightcolor: Fix functionality, update to new changes to config
|
2022-09-10 14:22:39 -04:00 |
|
Devin Lin
|
e9dad0651c
|
quicksettings/donotdisturb: Fix incorrect package format
|
2022-09-10 13:56:01 -04:00 |
|
Devin Lin
|
85d70bb589
|
shell: Fix containment being applied immediately
|
2022-09-10 12:41:41 -04:00 |
|
Devin Lin
|
1830b9dd2a
|
quicksettings/donotdisturb: Move do not disturb button to quick setting
|
2022-09-10 12:41:08 -04:00 |
|
Devin Lin
|
83790daccd
|
quicksettings/mobiledata: Add warning if APN is not configured
|
2022-09-09 23:37:15 -04:00 |
|
l10n daemon script
|
b51a575bc6
|
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-09-09 01:47:56 +00:00 |
|
l10n daemon script
|
bc6f26184a
|
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-09-08 01:51:21 +00:00 |
|
l10n daemon script
|
cbd1acc113
|
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-09-06 01:47:33 +00:00 |
|
l10n daemon script
|
79e1169815
|
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-09-05 01:44:45 +00:00 |
|
l10n daemon script
|
2bbc933297
|
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-09-04 01:47:14 +00:00 |
|
Devin Lin
|
28f1c14505
|
metadata: Fix cmake warnings from incorrectly configured kpackages
|
2022-09-03 11:34:36 -04:00 |
|
l10n daemon script
|
911c5c0da5
|
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-09-03 01:45:52 +00:00 |
|
l10n daemon script
|
fbaacc78ac
|
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-09-02 01:45:36 +00:00 |
|
Justin Zobel
|
048acddf13
|
quicksettings/powermenu - Use correct cmake name
|
2022-09-01 22:24:46 +09:30 |
|
l10n daemon script
|
0a0761bf8a
|
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-09-01 01:41:48 +00:00 |
|
Devin Lin
|
ab020a88de
|
quicksettings/record: Fix name
|
2022-08-30 20:54:34 -04:00 |
|
l10n daemon script
|
66e7b8cbf9
|
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-23 01:48:27 +00:00 |
|
l10n daemon script
|
2a94ef0d96
|
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-20 01:43:57 +00:00 |
|
Devin Lin
|
084294b566
|
quicksettings/record: Update quicksetting labels
|
2022-08-16 22:44:20 -04:00 |
|
l10n daemon script
|
7ba564fdeb
|
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-16 01:49:16 +00:00 |
|
l10n daemon script
|
b9fbb2da57
|
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-11 01:44:52 +00:00 |
|
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 |
|
l10n daemon script
|
aeddd5ab75
|
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-01 01:44:56 +00:00 |
|
l10n daemon script
|
93ee6189b0
|
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-07-31 01:50:10 +00:00 |
|
l10n daemon script
|
4ae02a3b9c
|
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-07-30 01:45:47 +00:00 |
|
l10n daemon script
|
f7de0bdd84
|
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-07-24 01:45:42 +00:00 |
|
l10n daemon script
|
9655dcdc6d
|
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-07-23 01:48:30 +00:00 |
|
l10n daemon script
|
32ca26c5fa
|
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-07-22 01:43:12 +00:00 |
|
Alexander Lohnau
|
9f2133ea32
|
quicksettings: Convert desktop file to JSON
Task: https://phabricator.kde.org/T14558
|
2022-07-21 19:30:11 +00:00 |
|
l10n daemon script
|
4daab15c23
|
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-07-11 01:49:02 +00:00 |
|
l10n daemon script
|
606997be18
|
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-07-09 01:50:33 +00:00 |
|
Aleix Pol
|
05fc50c033
|
flashlight: Mark itself as unavailable if unavailable
|
2022-07-07 14:09:24 +00:00 |
|
l10n daemon script
|
5a6559017e
|
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-07-07 01:44:15 +00:00 |
|
l10n daemon script
|
1629733d7e
|
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-06-30 01:45:48 +00:00 |
|
Aleix Pol
|
7b163661d5
|
PipeWireThumbnail, Record: Wayland handling doesn't belong in KPipeWire
|
2022-06-23 11:25:08 +02:00 |
|
l10n daemon script
|
af8ef4f9f8
|
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-06-13 02:37:20 +00:00 |
|
l10n daemon script
|
99614ecbd7
|
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-06-12 01:45:23 +00:00 |
|
l10n daemon script
|
de8b6d482a
|
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-06-05 01:44:59 +00:00 |
|
l10n daemon script
|
f1bce20b3e
|
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-06-01 01:58:30 +00:00 |
|
l10n daemon script
|
3b6a392380
|
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-05-30 01:44:23 +00:00 |
|
Aleix Pol
|
ecd1515217
|
Add a Record QuickSetting
Allows to record the current output conveniently from the drop-down.
|
2022-05-30 00:07:52 +00:00 |
|
l10n daemon script
|
e2adb7ae86
|
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-05-28 02:22:39 +00:00 |
|
l10n daemon script
|
4c83a3e422
|
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-05-15 01:57:29 +00:00 |
|
Yari Polla
|
6e075b9db7
|
quicksettings: show SSID in wifi quick setting
|
2022-04-30 15:07:46 +00:00 |
|
l10n daemon script
|
c6b55a9534
|
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-04-21 01:44:16 +00:00 |
|
Nicolas Fella
|
6099bf491f
|
Use undeprecated install dirs
Using kde-dev-scripts/kf5/cmakelists_install_vars.pl
|
2022-04-21 01:27:43 +00:00 |
|
l10n daemon script
|
f0e1d4e46e
|
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-04-16 01:47:42 +00:00 |
|
l10n daemon script
|
2d6d0c6789
|
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-04-09 01:50:14 +00:00 |
|
l10n daemon script
|
37b0e709e8
|
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-04-07 01:44:56 +00:00 |
|
l10n daemon script
|
03f3411c9a
|
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-04-05 01:49:56 +00:00 |
|
l10n daemon script
|
a385bae963
|
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-04-03 01:57:17 +00:00 |
|
l10n daemon script
|
7e53aab276
|
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-04-01 02:02:05 +00:00 |
|
l10n daemon script
|
8e13435ccb
|
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-29 02:17:10 +00:00 |
|
l10n daemon script
|
7ff5f2b0a9
|
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-28 01:44:53 +00:00 |
|
l10n daemon script
|
5f20862a3f
|
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-27 01:51:39 +00:00 |
|
l10n daemon script
|
98306a6c6e
|
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-25 01:47:35 +00:00 |
|
l10n daemon script
|
a005e9b746
|
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-24 01:50:51 +00:00 |
|
Devin Lin
|
d407bbcd18
|
quicksettings: Fix flashlight
|
2022-03-20 14:35:57 -04:00 |
|
l10n daemon script
|
0ce673f7b1
|
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-20 02:12:05 +00:00 |
|
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 |
|
Devin Lin
|
31ae31737c
|
quicksettings: Ensure package ids don't conflict with existing applets
|
2022-03-17 15:57:40 -04:00 |
|
Devin Lin
|
17b4b774a3
|
kcm: Add ability to reorder quicksettings
Implements #75, reordering of quick settings, and also includes the mobile form components into the kcm.
|
2022-03-17 15:34:35 -04:00 |
|
Devin Lin
|
35dec9d3d7
|
quicksettings/screenrotation: Move C++ out of ShellUtil into package
|
2022-03-17 00:33:13 -04:00 |
|
Devin Lin
|
500132e56b
|
quicksettings/flashlight: Move C++ out of ShellUtil into package
|
2022-03-17 00:07:29 -04:00 |
|