l10n daemon script
|
5264203fe8
|
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-19 01:18:10 +00:00 |
l10n daemon script
|
789a014df2
|
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-05-07 01:18:46 +00:00 |
l10n daemon script
|
8ecb5373c1
|
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-04-07 01:20:03 +00:00 |
l10n daemon script
|
c1ca4a3399
|
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-30 06:52:26 +01:00 |
l10n daemon script
|
6d6a361e8b
|
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-09-25 06:30:55 +02:00 |
l10n daemon script
|
fff8a8ccb4
|
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-09-14 06:15:50 +02:00 |
l10n daemon script
|
a88f49c59b
|
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-06-18 05:49:14 +02:00 |
l10n daemon script
|
0183d07911
|
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-06-17 14:16:35 +02:00 |
l10n daemon script
|
50f0827df6
|
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-03-25 06:42:37 +01:00 |
l10n daemon script
|
72cdc794df
|
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-02-06 05:38:22 +01:00 |
l10n daemon script
|
702c4ffd27
|
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-01-20 05:46:17 +01:00 |
l10n daemon script
|
551b53ea9c
|
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"
|
2019-12-08 05:22:17 +01:00 |
l10n daemon script
|
36a38057fa
|
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"
|
2019-08-13 05:20:27 +02:00 |
l10n daemon script
|
a558641bf6
|
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"
|
2019-05-03 05:51:44 +02:00 |
l10n daemon script
|
0403d5cf4a
|
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"
|
2019-04-23 06:06:30 +02:00 |
l10n daemon script
|
0e714dee65
|
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"
|
2019-02-10 05:24:10 +01:00 |
l10n daemon script
|
64b7108974
|
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"
|
2019-01-01 05:27:06 +01:00 |
l10n daemon script
|
033651f422
|
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"
|
2018-12-03 05:30:16 +01:00 |
l10n daemon script
|
2a3ec0535d
|
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"
|
2018-10-10 06:22:01 +02:00 |
l10n daemon script
|
49611c3574
|
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"
|
2018-09-07 05:56:51 +02:00 |
l10n daemon script
|
c33067b3f5
|
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"
|
2018-08-27 05:46:44 +02:00 |
l10n daemon script
|
37ebbd46ab
|
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"
|
2018-08-05 05:29:35 +02:00 |
l10n daemon script
|
a4773460f0
|
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"
|
2018-07-26 05:44:16 +02:00 |
l10n daemon script
|
8c8e8f8b47
|
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"
|
2018-04-03 05:28:21 +02:00 |
l10n daemon script
|
7dd9e17a8c
|
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"
|
2018-03-03 05:26:20 +01:00 |
l10n daemon script
|
e7354c02d1
|
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"
|
2018-01-13 04:48:00 +01:00 |
l10n daemon script
|
523e07cbf5
|
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"
|
2018-01-07 04:56:25 +01:00 |
l10n daemon script
|
7c1ff3cc19
|
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"
|
2017-12-24 04:48:55 +01:00 |
l10n daemon script
|
26db2cfd8c
|
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"
|
2017-12-11 04:38:36 +01:00 |
l10n daemon script
|
a6ed618ba6
|
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"
|
2017-11-27 04:58:05 +01:00 |
l10n daemon script
|
7e29cf6c62
|
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"
|
2017-11-20 04:32:00 +01:00 |
l10n daemon script
|
0b1780397e
|
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"
|
2017-10-24 05:07:07 +02:00 |
l10n daemon script
|
8baad25d47
|
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"
|
2017-10-02 05:00:54 +02:00 |
l10n daemon script
|
c9e9d31236
|
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"
|
2017-09-30 05:08:31 +02:00 |
l10n daemon script
|
485632e6e5
|
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"
|
2017-09-26 04:54:03 +02:00 |
l10n daemon script
|
9872a44597
|
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"
|
2017-09-23 04:55:31 +02:00 |
l10n daemon script
|
a8189399af
|
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"
|
2017-09-22 04:55:58 +02:00 |
Jonathan Riddell
|
f8f74d1698
|
revert duplicate commit
|
2017-09-13 15:30:00 +01:00 |
Jonathan Riddell
|
a4d7832f86
|
Add freedesktop.org keywords to .desktop file, Author: Jonathan Carter <jcarter@linux.com>
|
2017-09-13 15:17:41 +01:00 |
l10n daemon script
|
931b1e90e0
|
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"
|
2017-09-13 08:45:37 +02:00 |
l10n daemon script
|
385507c3cb
|
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"
|
2017-09-12 04:49:41 +02:00 |
l10n daemon script
|
688b21f9f7
|
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"
|
2017-09-11 04:50:44 +02:00 |
l10n daemon script
|
d70c1ab373
|
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"
|
2017-09-10 04:50:43 +02:00 |
l10n daemon script
|
1dd8e32d40
|
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"
|
2017-09-08 04:30:49 +02:00 |
Andrius Štikonas
|
421515dcaa
|
Add partition;disk keywords to the desktop file.
|
2017-09-06 14:12:15 +01:00 |
Andrius Štikonas
|
4e3fddc6eb
|
Rename desktop/appdata files to lowercase.
This is necessary for icons to work in Plasma Wayland session.
|
2017-04-09 00:28:04 +01:00 |