l10n daemon script
bbf4bd0bdc
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
066805c550
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"
8 years ago
l10n daemon script
22885c00b0
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
02a4cfb26a
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"
8 years ago
l10n daemon script
0ef249b5a5
GIT_SILENT made messages (after extraction)
8 years ago
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"
8 years ago
l10n daemon script
379edd6757
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"
8 years ago
l10n daemon script
cdf2921e32
GIT_SILENT made messages (after extraction)
8 years ago
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"
8 years ago
l10n daemon script
3cbcc9b521
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
7eaa3cb659
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"
8 years ago
l10n daemon script
d6e1a6808d
GIT_SILENT made messages (after extraction)
8 years ago
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"
8 years ago
l10n daemon script
a497d3bbec
GIT_SILENT made messages (after extraction)
8 years ago
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"
9 years ago
l10n daemon script
1883a06614
GIT_SILENT made messages (after extraction)
9 years ago
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"
9 years ago
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"
9 years ago
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"
9 years ago
l10n daemon script
f4504f4764
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"
9 years ago
l10n daemon script
e47a5432f5
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
715a948a12
GIT_SILENT made messages (after extraction)
9 years ago
Luigi Toscano
e93cb78992
Fix string: no exclamation mark, add article
...
Exclamation marks should not be used according the guidelines.
9 years ago
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"
9 years ago
l10n daemon script
f81b6603cd
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
127ce16b78
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"
9 years ago
l10n daemon script
1444a2d684
GIT_SILENT made messages (after extraction)
9 years ago
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"
9 years ago
l10n daemon script
193ecf7649
GIT_SILENT made messages (after extraction)
9 years ago
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"
9 years ago
l10n daemon script
e56e08a781
GIT_SILENT made messages (after extraction)
9 years ago
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"
9 years ago
l10n daemon script
910c06e4a6
GIT_SILENT made messages (after extraction)
9 years ago
Albert Astals Cid
e18783f749
Fix warning about TRANSLATION_DOMAIN being defined twice
9 years ago
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"
9 years ago
l10n daemon script
74679c3668
GIT_SILENT made messages (after extraction)
9 years ago
Luigi Toscano
007030a6df
Fix translation also for the new Markdown generator
...
Define the translation domain for it as well.
9 years ago
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"
9 years ago
Albert Astals Cid
39c76da6bf
markdown: Obey the font size set in the settings
9 years ago
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"
9 years ago
l10n daemon script
3422520a5c
GIT_SILENT made messages (after extraction)
9 years ago
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"
9 years ago
l10n daemon script
e279e26b40
GIT_SILENT made messages (after extraction)
9 years ago
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"
9 years ago
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
9 years ago
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
9 years ago