Commit graph

116 commits

Author SHA1 Message Date
l10n daemon script
9f6345c3f3 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-08 02:24:47 +00:00
l10n daemon script
1ab9d8827e 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-24 02:56:05 +00:00
l10n daemon script
42bf272681 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-19 02:38:31 +00:00
l10n daemon script
b1000c31d8 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-17 03:43:30 +00:00
l10n daemon script
c71737436e 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-05 02:36:13 +00:00
l10n daemon script
4b911fa0bc 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-03 02:25:31 +00:00
l10n daemon script
1bce7d92a5 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-03-19 02:23:28 +00:00
Devin Lin
dd0c95ac3d kded: Don't turn off kdecoration
Now that we have the convergentwindows script, the window decorations are managed by them.
2023-03-06 21:28:56 -08:00
l10n daemon script
ccbd4d03b7 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-02-24 02:05:19 +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
Marco Mattiolo
79b08dbbdf Add Type=Application in bin/plasma-mobile.desktop 2022-12-17 15:14:56 +00: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
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
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
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
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
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
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
5a9802ae5f 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-17 01:46:57 +00:00
l10n daemon script
29d5afaacf 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-15 01:49:14 +00:00
l10n daemon script
d2824deed0 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-14 01:52:14 +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
c632dab1c1 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-03 01:57:41 +00:00
l10n daemon script
9a913e1783 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-02 02:04:13 +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
l10n daemon script
6a0fcc83fd 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-29 01:46:28 +00:00
Devin Lin
c0642a6d41 bin: Add development session support 2022-06-27 12:42:19 -04:00
Devin Lin
b020230cd7 bin: kwinwrapper -> startplasmamobile 2022-06-27 12:04:54 -04: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
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
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
Aleix Pol
a6a331f469 Remove last two uses of PlasmaComponents 2.0
They were only used for Labels
2022-03-05 18:53:39 +00:00
l10n daemon script
f4ca3b96c7 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-02-28 01:41:06 +00:00
l10n daemon script
ee113b8cdc 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-02-14 01:43:34 +00:00
l10n daemon script
9cf37ea66c 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-02-11 01:46:47 +00:00
Devin Lin
4a3f855173 REUSE compliance, add check to CI, drop unused components 2021-12-23 16:02:41 +00:00
l10n daemon script
0c8cd94fe8 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"
2021-12-15 01:56:58 +00:00
Bhushan Shah
b7b963822c Fix plasma mobile session
KWin in plasma/kwin@ef72bae42f removed the libinput
option, if we start kwin with this option, it fails with unknown option
libinput and eventually gives up
2021-11-13 14:26:56 +05:30
Aleix Pol
1de0f3ec58 Revert the direct adoption of lookandfeeltool
It's not ready yet and it fails
2021-09-07 04:30:27 +02:00
Aleix Pol
42116f68c4 Use the lookandfeeltool to choose which shell we prefer
Instead of relying on an environment variable
This will also set the other necessary settings that we need for the
session to integrate properly like the Placement strategy for kwin
2021-09-02 15:35:09 +02:00
l10n daemon script
844be8376e 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"
2021-06-28 01:31:11 +00:00
David Edmundson
33400a872f Avoid potential double dbus start
See matching commit 8475fe4545998c806704a45a7d912f777a11533f in
plasma-workspace
2021-03-07 15:43:46 +00:00
Bhushan Shah
e01cf0b6a2 Drop un-needed environment variables 2021-02-15 16:35:18 +05:30
Bhushan Shah
6204b90a51 Drop workarounds
- We no longer support the hwcomposer stuff and that workaround was
wrong anyway
- Drop touching a random file which was added for debugging earlier
2021-01-04 13:09:32 +05:30
l10n daemon script
7c6cabf4a1 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"
2020-12-20 06:16:31 +01:00
Marco Martin
1abb6737e4 use org.kde.plasma.phoneshell as name 2020-12-15 13:41:08 +01:00
l10n daemon script
972046f062 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"
2020-12-09 06:49:33 +01:00
Noah Davis
27772fca54 Make qqc2-breeze-style the default QQC2 style 2020-12-06 12:51:20 +00:00