Commit graph

19 commits

Author SHA1 Message Date
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
193ecf7649 GIT_SILENT made messages (after extraction) 2017-09-12 03:23:37 +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
e56e08a781 GIT_SILENT made messages (after extraction) 2017-09-04 03:05:13 +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
910c06e4a6 GIT_SILENT made messages (after extraction) 2017-09-01 03:04:47 +02:00
Albert Astals Cid
e18783f749 Fix warning about TRANSLATION_DOMAIN being defined twice 2017-08-30 23:08:48 +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
74679c3668 GIT_SILENT made messages (after extraction) 2017-08-30 06:11:28 +02:00
Luigi Toscano
007030a6df Fix translation also for the new Markdown generator
Define the translation domain for it as well.
2017-08-30 01:29:43 +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
Albert Astals Cid
39c76da6bf markdown: Obey the font size set in the settings 2017-08-27 12:04:47 +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
3422520a5c GIT_SILENT made messages (after extraction) 2017-08-27 03:08:01 +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
e279e26b40 GIT_SILENT made messages (after extraction) 2017-08-26 03:18:37 +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
Albert Astals Cid
551f0b6271 Small rework for the markdown converter
Don't have the textdocument and dir as members, pass them along
This is to make clear that this is a "one off stateless conversion",
i.e. after convert returns the converter doesn't own the textdocument
anymore, so better don't keep a pointer to it
2017-08-25 01:14:58 +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