l10n daemon script
|
75bfdb616d
|
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-27 01:43:32 +00:00 |
|
l10n daemon script
|
7297a41073
|
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-21 01:44:31 +00:00 |
|
l10n daemon script
|
a94d566295
|
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-16 01:48:35 +00:00 |
|
l10n daemon script
|
6416733153
|
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-15 01:51:03 +00:00 |
|
l10n daemon script
|
e5a3408f1f
|
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-03 01:58:13 +00:00 |
|
l10n daemon script
|
893c647c94
|
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-01 02:02:34 +00:00 |
|
l10n daemon script
|
350ba6403a
|
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-29 02:19:23 +00:00 |
|
l10n daemon script
|
09395b5bc5
|
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-21 01:45:32 +00:00 |
|
l10n daemon script
|
42db61d50d
|
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-20 02:13:08 +00:00 |
Salvo "LtWorf" Tomaselli
|
8c116ab5dd
|
Show loading notification and add keywords to desktop file
|
2022-03-18 12:01:59 +00:00 |
|
l10n daemon script
|
73f2c46638
|
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-27 01:54:50 +00:00 |
|
l10n daemon script
|
b3dac269b7
|
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-12-10 01:44:51 +00:00 |
|
l10n daemon script
|
91a6cc652e
|
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-08 01:29:28 +00:00 |
|
l10n daemon script
|
4efca614f6
|
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-08-15 01:25:31 +00:00 |
Devin Lin
|
00be5e3872
|
Add X-KDE-FormFactor
|
2021-07-27 22:25:16 +00:00 |
|
l10n daemon script
|
6a4c6011d1
|
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-05 01:18:52 +00:00 |
|
l10n daemon script
|
159688035a
|
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-06-22 01:20:30 +00:00 |
|
l10n daemon script
|
4221d5fa9d
|
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-06-05 01:17:37 +00:00 |
Tobias Fella
|
54dee8676c
|
Add more license statements
|
2021-05-28 02:36:19 +02:00 |
|
l10n daemon script
|
66ff1337be
|
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-24 01:15:25 +00:00 |
|
l10n daemon script
|
bd2586f33a
|
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-17 01:36:50 +00:00 |
|
l10n daemon script
|
0c13326ab1
|
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-15 01:20:25 +00:00 |
|
l10n daemon script
|
f941019a16
|
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-14 01:15:32 +00:00 |
|
l10n daemon script
|
f794ebd899
|
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-11 01:18:58 +00:00 |
|
l10n daemon script
|
1fdb1ccc55
|
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-10 01:21:32 +00:00 |
|
l10n daemon script
|
508f353104
|
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-09 01:21:36 +00:00 |
|
l10n daemon script
|
86327a98d8
|
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-08 01:18:40 +00:00 |
Bart De Vries
|
1c44e717ae
|
Renaming alligator to kasts everywhere
|
2021-05-03 22:31:45 +02:00 |