Commit graph

393 commits

Author SHA1 Message Date
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
2018-11-07 23:30:22 +01:00
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"
2018-10-24 05:59:57 +02:00
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"
2018-10-10 06:37:12 +02:00
l10n daemon script
96f4f27ba6 GIT_SILENT made messages (after extraction) 2018-10-10 04:08:48 +02:00
Yuri Chornoivan
c04ca1fa96 Fix minor EBN issues 2018-08-31 12:23:45 +03:00
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"
2018-08-04 05:43:46 +02:00
l10n daemon script
5f93a0b90e GIT_SILENT made messages (after extraction) 2018-08-04 03:45:00 +02:00
l10n daemon script
860dc697ef GIT_SILENT made messages (after extraction) 2018-07-14 03:29:12 +02:00
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"
2018-07-07 05:17:35 +02:00
l10n daemon script
26c40ab7bd GIT_SILENT made messages (after extraction) 2018-05-06 03:31:04 +02:00
Aleix Pol
52b62306f8 Also don't use KPty code for Android
Changed the defines to something more explicit of what's going on.
2018-04-13 17:44:50 +02:00
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"
2018-01-29 05:04:25 +01:00
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"
2017-12-01 04:51:24 +01:00
l10n daemon script
22885c00b0 GIT_SILENT made messages (after extraction) 2017-12-01 03:10:28 +01:00
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"
2017-11-28 06:52:56 +01:00
l10n daemon script
0ef249b5a5 GIT_SILENT made messages (after extraction) 2017-11-28 05:48:07 +01:00
l10n daemon script
1883a06614 GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
l10n daemon script
72abe6f85a GIT_SILENT made messages (after extraction) 2017-10-11 06:41:11 +02:00
Kevin Funk
a53a2402ca clang-tidy: modernize-use-nullptr run
Semi-ACK'd by Albert :)
2017-09-06 00:19:48 +02:00
Albert Astals Cid
69982161e7 Merge remote-tracking branch 'origin/Applications/17.08' 2017-08-30 23:08:20 +02:00
Albert Astals Cid
9a25ea41dc Fix warning about TRANSLATION_DOMAIN being defined twice 2017-08-30 23:07:03 +02:00
Luigi Toscano
d9584b30d8 Merge remote-tracking branch 'origin/Applications/17.08' 2017-08-30 01:29:21 +02:00
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.
2017-08-30 01:27:35 +02:00
l10n daemon script
3349c9fff7 GIT_SILENT made messages (after extraction) 2017-08-27 05:21:29 +02:00
l10n daemon script
3422520a5c GIT_SILENT made messages (after extraction) 2017-08-27 03:08:01 +02:00
l10n daemon script
0b85b7c138 GIT_SILENT made messages (after extraction) 2017-08-26 05:23:57 +02:00
l10n daemon script
e279e26b40 GIT_SILENT made messages (after extraction) 2017-08-26 03:18:37 +02:00
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"
2017-07-30 04:54:11 +02:00
l10n daemon script
19406fdf57 GIT_SILENT made messages (after extraction) 2017-07-30 03:25:35 +02:00
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"
2017-05-21 04:36:10 +02:00
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"
2017-05-12 04:21:17 +02:00
l10n daemon script
ef9ea64bc3 GIT_SILENT made messages (after extraction) 2017-05-12 02:59:10 +02:00
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"
2017-04-22 04:06:38 +02:00
l10n daemon script
a25642c178 GIT_SILENT made messages (after extraction) 2017-04-22 02:52:16 +02:00
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"
2017-04-17 04:01:59 +02:00
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"
2017-04-09 04:02:44 +02:00
Albert Astals Cid
191a37fb52 Q_DECL_OVERRIDE -> override 2017-03-02 20:39:24 +01:00
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"
2017-02-07 12:50:18 +01:00
l10n daemon script
2a0bdca687 GIT_SILENT made messages (after extraction) 2017-02-07 08:56:11 +01:00
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"
2017-02-06 06:04:23 +01:00
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"
2017-02-04 06:23:35 +01:00
l10n daemon script
0922f2f524 GIT_SILENT made messages (after extraction) 2017-02-04 03:59:15 +01:00
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"
2017-02-02 05:57:03 +01:00
Martin T. H. Sandsmark
7f3eebd9f3 Only show warning messages by default
REVIEW: 129832
2017-01-16 18:41:33 +01:00
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"
2017-01-09 06:00:41 +01:00
l10n daemon script
93b824de9e GIT_SILENT made messages (after extraction) 2017-01-09 03:54:16 +01:00
l10n daemon script
30993aa3f1 GIT_SILENT made messages (after extraction) 2016-12-26 03:41:57 +01:00
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"
2016-12-20 13:06:28 +01:00
l10n daemon script
006cb782a2 GIT_SILENT made messages (after extraction) 2016-12-20 09:19:46 +01:00
l10n daemon script
20f6524016 GIT_SILENT made messages (after extraction) 2016-12-13 02:45:16 +01:00