l10n daemon script
|
ef53790eba
|
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-10 05:21:36 +02:00 |
|
Nate Graham
|
4ee6b5066d
|
Merge branch 'release/20.04'
|
2020-06-09 13:16:33 -06:00 |
|
l10n daemon script
|
cc452498e5
|
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-09 09:16:32 +02:00 |
|
Nicolas Fella
|
7d24a51e6a
|
Launch okularkirigami directly instead of via kpackagelauncherqml
|
2020-03-29 12:39:19 +00:00 |
|
l10n daemon script
|
0d5bd0bc43
|
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-04 06:09:17 +01:00 |
|
l10n daemon script
|
79de5d3958
|
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-28 05:42:48 +01:00 |
|
l10n daemon script
|
d40d89a029
|
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-25 05:24:21 +01:00 |
|
l10n daemon script
|
6aecd5d5db
|
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-10 05:25:56 +01:00 |
|
l10n daemon script
|
bf7a53d62b
|
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-12 05:10:27 +02:00 |
|
l10n daemon script
|
4e9bbfddb0
|
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:37:12 +02:00 |
|
l10n daemon script
|
f1d3c68115
|
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-04 05:43:46 +02:00 |
|
l10n daemon script
|
0d38577b4a
|
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-02-08 05:11:36 +01:00 |
|
l10n daemon script
|
daaa084476
|
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-15 04:46:05 +01:00 |
|
l10n daemon script
|
f1e2ebbaed
|
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-11 04:50:21 +01:00 |
|
l10n daemon script
|
6ff1864dc2
|
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-08 04:48:31 +01:00 |
|
l10n daemon script
|
c5bb0a0941
|
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-04 04:43:49 +01:00 |
|
l10n daemon script
|
42650e4f27
|
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-28 05:07:33 +01:00 |
|
l10n daemon script
|
863ae954a7
|
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 05:02:58 +01:00 |
|
l10n daemon script
|
cc24d1c3ed
|
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-17 05:05:54 +01:00 |
|
l10n daemon script
|
75604b10ea
|
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:11:28 +02:00 |
|
l10n daemon script
|
d288b417da
|
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-07 05:12:38 +02:00 |
|
l10n daemon script
|
b3e941e736
|
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-27 09:08:25 +02:00 |
|
l10n daemon script
|
f6424adcaa
|
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:57:27 +02:00 |
|
l10n daemon script
|
62ce3db93b
|
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-16 05:03:07 +02:00 |
|
l10n daemon script
|
9d4067059f
|
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:52:10 +02:00 |
|
l10n daemon script
|
4be86a4bdc
|
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-04 04:41:43 +02:00 |
|
l10n daemon script
|
dbb801f25a
|
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-01 04:36:38 +02:00 |
|
l10n daemon script
|
7e5e26a16f
|
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-08-30 08:01:42 +02:00 |
|
l10n daemon script
|
0f01012601
|
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-08-29 04:40:15 +02:00 |
|
l10n daemon script
|
a6731c0ef4
|
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-08-27 04:42:43 +02:00 |
|
l10n daemon script
|
92a08d9a7d
|
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-08-26 04:45:47 +02:00 |
|
l10n daemon script
|
003d46e926
|
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-08-25 04:48:47 +02:00 |
|
Julian Wolff
|
4931385777
|
add markdown support
Summary:
Adds support for Markdown documents
BUG: 360603
Test Plan: Open a Markdown (.md) document in Okular
Reviewers: #okular, aacid
Reviewed By: #okular, aacid
Subscribers: michaelweghorn, aacid
Tags: #okular
Differential Revision: https://phabricator.kde.org/D7382
|
2017-08-25 01:05:23 +02:00 |
|