Laurent Montel
9f90e14dd1
Fix forward declaration
7 years ago
l10n daemon script
a7742d4604
GIT_SILENT made messages (after extraction)
7 years ago
Albert Astals Cid
d9515bb625
mArchiveDir can be const, so we save a nasty const_cast
7 years ago
Laurent Montel
5a3a49c310
Port qSort to std::sort
7 years ago
l10n daemon script
aaa176041d
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
5e01eff352
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
241bc6525a
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"
7 years ago
Alexander Volkov
0d958be290
Fix MimeType in org.kde.mobile.okular_comicbook.desktop
7 years ago
Albert Astals Cid
47d7d04b5e
delete copy constructor and assignment operator of some internal classes
...
they are unused(except the PageViewItem one), but if anyone would use
them things would go wrong, so protect us from it
Actually fixes a bug in PageView::slotFitWindowToPage in which we were
copying constructing PageViewItem and that's bad
7 years ago
Fabio Bolz
4e353aabee
Add unarchiver support for cbr files
...
Summary:
FEATURE: 339370
When no unrar installed, Okular now utilizes the program unar for extracting the archive and lsar for listing the content in the archive.
lsar is related and comes with a unar installation.
Subscribers: aacid, okular-devel
Tags: #okular
Differential Revision: https://phabricator.kde.org/D15691
7 years ago
l10n daemon script
33a5f67eb2
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"
7 years ago
l10n daemon script
4e9bbfddb0
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
96f4f27ba6
GIT_SILENT made messages (after extraction)
8 years ago
Yuri Chornoivan
c04ca1fa96
Fix minor EBN issues
8 years ago
l10n daemon script
d85fe1df64
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
bae0e13719
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
f1d3c68115
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
5f93a0b90e
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
860dc697ef
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
2e73a6d76f
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
879a46ac55
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
b7c733f459
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
ee57925c57
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
26c40ab7bd
GIT_SILENT made messages (after extraction)
8 years ago
Aleix Pol
52b62306f8
Also don't use KPty code for Android
...
Changed the defines to something more explicit of what's going on.
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