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
|
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
|
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
|
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 |
|