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
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
1c3e55c4f2
SVN_SILENT made messages (after extraction)
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
92efe12446
SVN_SILENT made messages (after extraction)
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
dcb51a7f26
SVN_SILENT made messages (after extraction)
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
l10n daemon script
466a6ae8c2
SVN_SILENT made messages (after extraction)
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
Burkhard Lück
4c1a44bc40
add missing metainfo.xml files
9 years ago
Burkhard Lück
9ae16afd97
use reverse domain-name scheme for metainfo.xml files
9 years ago
Burkhard Lück
1c9a9ce947
use reverse domain-name for component ID
9 years ago
Burkhard Lück
8666cacb92
add appdata file + metadata for chm, comicbook, djvu, dvi, epub, fax, fictionbook
...
REVIEW:128404
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
Aleix Pol
34ea79c2c3
Fix ms-its protocol lookup in kf5
10 years ago
Albert Vaca
c71f308252
Fixes suggested by Clazy
10 years ago
Martin T. H. Sandsmark
95bdeea2d7
Remove unnecessary and deprecated calls
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
b512e668e0
chm, dvi: Fix build with compiler flags after removing kdelibs4support
...
After removing kdelibs4support, these flags are enabled:
-DQT_USE_FAST_OPERATOR_PLUS -DQT_NO_CAST_TO_ASCII
-DQT_NO_CAST_FROM_ASCII -DQT_NO_URL_CAST_FROM_STRING
-DQT_NO_CAST_FROM_BYTEARRAY
So wrap naked string and character literals in QStringLiteral,
QLatin1Char and QLatin1String as appropriate.
To more easily see the changes, use «git show --color-words».
Thank $DEITY for vim macros.
10 years ago
Martin T. H. Sandsmark
439ced872d
Port away from signal/slot keyword
...
When building okular without kdelibs4support it apparently builds with
-DQT_NO_SIGNALS_SLOTS_KEYWORDS.
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
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
Michel Ludwig
4c7c7dbd8c
Unify the naming of logging categories
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
l10n daemon script
dde68921b6
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
f6d4b45650
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
2669a2f354
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
2b1cf29728
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