l10n daemon script
|
13a573c7f6
|
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-06-01 03:23:16 +00:00 |
|
l10n daemon script
|
1f02c5ea5e
|
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-03 02:01:04 +00:00 |
|
l10n daemon script
|
19b530d34b
|
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-12-26 02:03:49 +00:00 |
|
l10n daemon script
|
2c3715aef6
|
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-27 01:49:19 +00:00 |
|
l10n daemon script
|
761ec0f1cb
|
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-01 01:54:38 +00:00 |
|
l10n daemon script
|
7b5b8197bc
|
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-07 01:48:36 +00:00 |
|
l10n daemon script
|
7b393f2681
|
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-14 01:41:26 +00:00 |
|
l10n daemon script
|
3a969189b8
|
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-13 01:44:55 +00:00 |
|
l10n daemon script
|
a747d44cac
|
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-14 01:43:37 +00:00 |
|
l10n daemon script
|
c59e3db1dd
|
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-05 01:43:56 +00:00 |
|
l10n daemon script
|
537a1e44b1
|
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-25 01:50:55 +00:00 |
|
l10n daemon script
|
b236e61ea7
|
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-01-22 01:48:34 +00:00 |
|
l10n daemon script
|
e86f70db85
|
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-01-02 01:57:27 +00:00 |
|
l10n daemon script
|
00d8fb75e3
|
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-01-01 01:42:37 +00:00 |
|
Nicolas Fella
|
5e1adf7ea7
|
Fix notifications on Android
Bundle the notifyrc file in qrc so that KNotifications finds it
|
2021-12-22 14:23:47 +00:00 |
|