l10n daemon script
|
ecd6a63564
|
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-01-12 10:47:53 +01:00 |
|
l10n daemon script
|
43288db000
|
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-01-02 10:22:39 +01:00 |
|
l10n daemon script
|
6daf184a60
|
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-01-01 09:39:20 +01:00 |
|
l10n daemon script
|
ec4aa320c1
|
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-29 09:36:04 +01:00 |
|
l10n daemon script
|
b574849df3
|
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-26 09:29:49 +01:00 |
|
Nicolas Fella
|
ad4e52b20d
|
Fix icon in notifyrc
(cherry picked from commit ef8c21213a)
|
2020-12-22 22:02:23 +00:00 |
|
l10n daemon script
|
6ff31f1714
|
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-16 10:13:41 +01:00 |
|
l10n daemon script
|
7fe3c53661
|
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-14 09:28:48 +01:00 |
|
l10n daemon script
|
d9218b203d
|
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-11-17 06:15:36 +01:00 |
|
l10n daemon script
|
4240d55669
|
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-11-13 06:21:10 +01:00 |
|
l10n daemon script
|
04020e7021
|
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-11-12 06:24:28 +01:00 |
|
l10n daemon script
|
91f82fb42c
|
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-11-07 06:24:31 +01:00 |
|
l10n daemon script
|
ed3919cb83
|
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-11-06 06:20:30 +01:00 |
|
l10n daemon script
|
bd0a01b235
|
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-11-05 06:31:55 +01:00 |
|
l10n daemon script
|
36a92be7bd
|
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-11-04 06:30:04 +01:00 |
|
l10n daemon script
|
e4338a599e
|
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-11-03 06:12:27 +01:00 |
|
Tobias Fella
|
8e7c84fd78
|
Port the notification backend to KNotifications
|
2020-11-02 22:46:51 +00:00 |
|