l10n daemon script
ee57925c57
GIT_SILENT made messages (after extraction)
8 years ago
Abdel-Rahman Abdel-Rahman
ce7fa7b9d8
Fictionbook: Add support for code, superscript, & subscript tags
...
Summary: BUG: 387426
Test Plan: Open a book with the code, superscript, & subscript tags. Verify that the code is visible in a mono-space font, & superscripts & subscripts are formatted appropriately.
Reviewers: #okular, aacid
Reviewed By: #okular, aacid
Subscribers: aacid, cfeck, ngraham
Tags: #okular
Differential Revision: https://phabricator.kde.org/D10566
8 years ago
l10n daemon script
9c6494b353
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
29b1dec92b
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
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
1883a06614
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
76a4ad6323
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
72abe6f85a
GIT_SILENT made messages (after extraction)
9 years ago
Kevin Funk
a53a2402ca
clang-tidy: modernize-use-nullptr run
...
Semi-ACK'd by Albert :)
9 years ago
Albert Astals Cid
9a25ea41dc
Fix warning about TRANSLATION_DOMAIN being defined twice
9 years ago
Luigi Toscano
e858ecdd7c
Fix translations: add translation domain for generators
...
Generators are libraries, so define the proper TRANSLATION_DOMAIN
for each for them.
Thanks Albert for spotting this.
9 years ago
l10n daemon script
3349c9fff7
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
3422520a5c
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
0b85b7c138
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
e279e26b40
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
36c60741fb
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
19406fdf57
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
451bb151c2
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
5af987dac0
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
bb8c12d1eb
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
767a1c0eac
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
58d23a20ae
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
bfe1f62eb5
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
ef9ea64bc3
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
cd1d36df29
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
94fbca1c95
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
a25642c178
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
91e740c236
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
dc104a44dc
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
cce5cf2592
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
191a37fb52
Q_DECL_OVERRIDE -> override
9 years ago
Albert Astals Cid
4072eb0c3a
Add override
9 years ago
l10n daemon script
5b7a8d3d67
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
15543ea8bd
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
c55c44ed95
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
2a0bdca687
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
963ce79c45
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
7381616690
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
53a6cde141
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
0922f2f524
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
0e1cf0fbb9
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
0cbf1d24e7
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
e44b17080a
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
93b824de9e
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
4290dffb1b
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
30993aa3f1
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
fb77e0d1fd
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