Commit graph

11 commits

Author SHA1 Message Date
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
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
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
Devin Lin
8c885bc699 quicksettings/record: Move record functions out of shellutil 2022-10-12 12:00:12 -04:00
Renamed from quicksettings/record/metadata.json (Browse further)