Alexander Lohnau
|
4ca8f98b7d
|
Remove obsolete ServiceTypes definitions
Task: https://phabricator.kde.org/T14483
|
2023-07-22 19:12:33 +02:00 |
|
l10n daemon script
|
09f38caec5
|
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-20 01:54:21 +00:00 |
|
l10n daemon script
|
4e364c67d1
|
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 01:40:26 +00:00 |
|
l10n daemon script
|
ca5c5ab333
|
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-05-28 01:40:43 +00:00 |
|
l10n daemon script
|
40e7cab454
|
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-04-27 01:43:28 +00:00 |
|
l10n daemon script
|
bb403a3294
|
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-04-25 01:47:55 +00:00 |
|
l10n daemon script
|
eb04209601
|
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-04-23 01:46:30 +00:00 |
|
l10n daemon script
|
a5850cca3b
|
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-04-22 01:47:35 +00:00 |
|
l10n daemon script
|
5da47e9f91
|
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-04-18 01:41:53 +00:00 |
|
l10n daemon script
|
f5e93700a5
|
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-04-16 01:40:41 +00:00 |
|
l10n daemon script
|
3b42d0fc27
|
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-04-15 01:42:57 +00:00 |
|
l10n daemon script
|
c08b663401
|
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-04-14 01:38:30 +00:00 |
|
l10n daemon script
|
0a827f9e06
|
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-04-11 01:42:34 +00:00 |
|
l10n daemon script
|
ebd70efd3e
|
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-04-10 01:39:38 +00:00 |
|
l10n daemon script
|
ad53dea58e
|
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-04-09 01:40:22 +00:00 |
|
l10n daemon script
|
3040f49a2e
|
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-04-08 01:41:50 +00:00 |
|
Albert Vaca Cintora
|
02e2e1104e
|
Change my name to include my two last names :)
|
2023-04-08 00:20:47 +02:00 |
|
l10n daemon script
|
c4495d5855
|
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-02-04 02:05:14 +00:00 |
|
l10n daemon script
|
3ee29af814
|
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-01 02:14:13 +00:00 |
|
l10n daemon script
|
6acbcd628d
|
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-15 01:56:04 +00:00 |
|
l10n daemon script
|
4656144ac9
|
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-11-19 01:48:52 +00:00 |
|
l10n daemon script
|
e712748881
|
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-11-17 01:47:30 +00:00 |
|
l10n daemon script
|
e77ba5b542
|
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-20 02:01:51 +00:00 |
|
l10n daemon script
|
dbf8b07cab
|
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-23 01:43:42 +00:00 |
|
l10n daemon script
|
34da0ad9e1
|
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-05 01:43:43 +00:00 |
|
l10n daemon script
|
b525d660bc
|
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-25 01:46:23 +00:00 |
|
l10n daemon script
|
7f0b03f254
|
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:42:55 +00:00 |
|
l10n daemon script
|
3f42e61b1d
|
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-02 02:00:21 +00:00 |
|
l10n daemon script
|
c91eaceee1
|
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-04-25 01:49:25 +00:00 |
|
l10n daemon script
|
5b314846fe
|
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-20 01:45:04 +00:00 |
|
l10n daemon script
|
c630a3de90
|
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-11-04 01:16:42 +00:00 |
|
l10n daemon script
|
4462b74866
|
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-11-03 01:25:15 +00:00 |
|
l10n daemon script
|
9d78e17e42
|
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-02 01:17:46 +00:00 |
|
l10n daemon script
|
a3082de593
|
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-28 01:18:37 +00:00 |
|
l10n daemon script
|
46a19ac6cf
|
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-19 01:18:23 +00:00 |
|
l10n daemon script
|
c314093d7e
|
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-03-24 05:53:37 +01:00 |
|
l10n daemon script
|
cd1d047a3c
|
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-02-15 07:07:57 +01:00 |
|
l10n daemon script
|
f814a2c8f6
|
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-10-17 06:06:46 +02:00 |
|
l10n daemon script
|
e57fd79f26
|
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-19 06:10:24 +02:00 |
|
l10n daemon script
|
b7bdc75ff9
|
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-17 06:15:05 +02:00 |
|
l10n daemon script
|
e44e4a4c19
|
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-20 05:10:40 +02:00 |
|
l10n daemon script
|
653a708727
|
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:39:20 +02:00 |
|
l10n daemon script
|
e873eddcde
|
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:06:59 +02:00 |
|
l10n daemon script
|
5ef95c7c25
|
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-04-09 06:26:57 +02:00 |
|
l10n daemon script
|
0e04769a43
|
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-04-07 06:11:40 +02:00 |
|
l10n daemon script
|
b830c8f33b
|
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-19 05:49:03 +01:00 |
|
l10n daemon script
|
56880448fd
|
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-11-30 05:34:44 +01:00 |
|
l10n daemon script
|
cb307e16b2
|
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-11-17 05:06:27 +01:00 |
|
l10n daemon script
|
2d2cf7444a
|
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-07 05:00:07 +02:00 |
|
l10n daemon script
|
b7a6b1f00e
|
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-07-23 05:10:46 +02:00 |
|