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 |
|
l10n daemon script
|
21f28c6ae8
|
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-10-18 01:18:59 +00:00 |
|
l10n daemon script
|
4d8bf06da1
|
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-10-09 01:18:16 +00:00 |
|
l10n daemon script
|
204acee273
|
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-10-05 01:20:23 +00:00 |
|
l10n daemon script
|
e6c27636da
|
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-09-20 01:26:01 +00:00 |
|
l10n daemon script
|
464141c0a8
|
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-09-01 01:21:40 +00:00 |
|
Aleix Pol
|
31448728b8
|
Make the phoneshell a bit more flexible
Use plasma-open-settings to open configs instead of directly
plasma-settings.
This way we're less dependent on specific set up.
|
2021-08-31 17:23:20 +02:00 |
|
l10n daemon script
|
1da2432dec
|
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-08-31 01:29:49 +00:00 |
|
l10n daemon script
|
60f48d729c
|
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-08-29 01:21:08 +00:00 |
|
l10n daemon script
|
c0ff474e72
|
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-08-14 01:18:38 +00:00 |
|
l10n daemon script
|
7ef6c9c7c9
|
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-08-04 01:16:00 +00:00 |
|
l10n daemon script
|
5ab4624f19
|
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-08-01 01:21:28 +00:00 |
|
l10n daemon script
|
3922cd51ab
|
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-07-29 01:15:23 +00:00 |
|
l10n daemon script
|
66411f24e6
|
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-07-27 01:26:02 +00:00 |
|
l10n daemon script
|
622d96d50a
|
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-07-26 01:17:42 +00:00 |
|
l10n daemon script
|
393047e905
|
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-07-25 01:14:39 +00:00 |
|
l10n daemon script
|
d7de1fb9b1
|
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-07-24 01:14:22 +00:00 |
|
l10n daemon script
|
44a7f0d3cb
|
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-07-23 01:15:30 +00:00 |
|
Aleix Pol
|
dd888a707f
|
Make it possible for QuickSettings to be created in a KPackage
Move the NightColor one into a KPackage to prove it
|
2021-07-21 13:36:43 +00:00 |
|