l10n daemon script
da42e4b166
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
854d997fd5
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
5a7f11927f
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
d075df4eb0
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
151a8f7e78
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
2e65d70f63
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
16c265e8db
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
d89ad9053a
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
ae6961a63c
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
825272fa0e
SVN_SILENT made messages (after extraction)
9 years ago
Luigi Toscano
97b41df935
UI messages: fix the capitalization
9 years ago
l10n daemon script
b0024f05c7
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
3898a99a8f
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
36befe7161
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
3107e544b4
SVN_SILENT made messages (after extraction)
9 years ago
Burkhard Lück
4b7455396e
add metadata for kimgio, mobipocket, ooo, plucker, poppler, spectre, txt, xps
...
REVIEW:129347
BUG:363842
9 years ago
l10n daemon script
66cba6e293
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
3f484b44a9
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
a673dca880
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
b1bb8bfc61
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
Friedrich W. H. Kossebau
37aafeba93
Remove no longer existing include dir
...
--warnings
9 years ago
l10n daemon script
3a16c16a17
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
191e10300d
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 Vaca
c71f308252
Fixes suggested by Clazy
10 years ago
Martin T. H. Sandsmark
fc09e52fc3
Port away from deprecated KArchive method
10 years ago
Olivier CHURLAUD
3b608a66c9
Preview functions again.
...
I added again the okularXXX.desktop
Correct the mess done by review 126193
10 years ago
Martin T. H. Sandsmark
2b473fedbd
generators: Fix build without implicit cast to/from ascii
...
See previous commit for details.
10 years ago
l10n daemon script
bae370462c
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"
10 years ago
Aleix Pol
f42a3bad65
Drop libkscreen dependency
...
Drops the x11 fallback. We were falling back to QX11Extras that were in
fact using QScreen internally.
Also remove the QDesktopWidget fallbacks for the same reason.
Drops some API for fetching the dpi and unifies it with ::realDpi(QWidget).
Based on Sebas's patch.
Reviewed by Albert.
REVIEW: 126913
10 years ago
Patrick Spendrin
37d5623102
Remove kdelibs4support from the generator plugins
...
This removes kdelibs4support for all generators except the mobipocket one.
The test executable for kimgio needs some windows fixes too, so I'll try
to make a separate review for that.
REVIEW: 126375
10 years ago
l10n daemon script
ee162ffddb
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
119bb0ecd2
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"
10 years ago
l10n daemon script
a8cdfcb0d3
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
57c5cbfde0
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"
10 years ago
l10n daemon script
1df2d478a9
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
b4ffc41bd0
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
a2fd918ad9
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"
10 years ago
Alex Richardson
00b15528a4
Add the Copyright information back to the JSON files
...
REVIEW: 126193
10 years ago
Alex Richardson
2f9246ae42
Port to new JSON plugin loading system
...
This means Okular can now work without ksycoca and KDELibs4Support.
REVIEW: 126193
10 years ago
l10n daemon script
2fee136339
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"
10 years ago
l10n daemon script
9c7a558b8c
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
16f0780688
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"
10 years ago
l10n daemon script
9a5c82a411
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"
11 years ago
Montel Laurent
466eb79615
Use QStringLiteral
11 years ago
l10n daemon script
98ac941316
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"
11 years ago
l10n daemon script
8c141cc2fc
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"
11 years ago
l10n daemon script
cd34059f53
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"
11 years ago
l10n daemon script
7b8f0a7459
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"
11 years ago
l10n daemon script
22ba4596fa
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"
11 years ago
l10n daemon script
558b4bb765
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"
11 years ago