office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-11-05 18:34:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
8220 commits 138 branches 360 tags 104 MiB
Commit graph

2073 commits

Author SHA1 Message Date
l10n daemon script
1883a06614 GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
l10n daemon script
0ac3f27a9e 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-10-15 04:59:46 +02:00
l10n daemon script
72abe6f85a GIT_SILENT made messages (after extraction) 2017-10-11 06:41:11 +02:00
l10n daemon script
d288b417da 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-10-07 05:12:38 +02:00
l10n daemon script
24b481658e GIT_SILENT made messages (after extraction) 2017-10-01 03:34:14 +02:00
Albert Astals Cid
a93661e892 Merge remote-tracking branch 'origin/master' into dont-use-docdata-for-annots-and-forms 2017-09-27 15:01:57 +02:00
l10n daemon script
b3e941e736 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-09-27 09:08:25 +02:00
l10n daemon script
f6424adcaa 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-09-26 04:57:27 +02:00
l10n daemon script
f4504f4764 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-09-25 04:51:51 +02:00
l10n daemon script
e47a5432f5 GIT_SILENT made messages (after extraction) 2017-09-25 03:23:02 +02:00
l10n daemon script
715a948a12 GIT_SILENT made messages (after extraction) 2017-09-22 03:29:12 +02:00
Luigi Toscano
e93cb78992 Fix string: no exclamation mark, add article 
Exclamation marks should not be used according the guidelines.
 2017-09-21 21:15:37 +02:00
Milian Wolff
ec795473fa Make compile with strict iterators 2017-09-20 16:34:41 +02:00
Milian Wolff
9d0cc7528f Make compile with strict iterators 2017-09-20 16:32:04 +02:00
l10n daemon script
62ce3db93b 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-09-16 05:03:07 +02:00
l10n daemon script
f81b6603cd GIT_SILENT made messages (after extraction) 2017-09-16 03:28:21 +02:00
l10n daemon script
127ce16b78 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-09-13 08:48:01 +02:00
l10n daemon script
1444a2d684 GIT_SILENT made messages (after extraction) 2017-09-13 06:57:51 +02:00
Gilbert Assaf
99be29e50b Merge branch 'master' of git://anongit.kde.org/okular 2017-09-12 23:07:16 +02:00
l10n daemon script
9d4067059f 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-09-12 04:52:10 +02:00
l10n daemon script
193ecf7649 GIT_SILENT made messages (after extraction) 2017-09-12 03:23:37 +02:00
Gilbert Assaf
6b27aa53fa CHM Generator Lib Update 
This patch updates our copy of the chm lib from kchmviewer. The lib files itself are an unmodified copy from kchmviewer 7.7, only our generator needed some changes. In contrast to kchmviewer we still use khtml and therefor still need msits.

REVIEW: 130226
 2017-09-11 21:25:55 +02:00
Albert Astals Cid
04ed10d3ea Merge remote-tracking branch 'origin/master' into dont-use-docdata-for-annots-and-forms 2017-09-11 19:51:51 +02:00
Oliver Sander
5a716e067a Implement rasterized printing with QPrinter with hidden annotations 
Previously, rasterized printing would use the QPrinter backend whenever
annotations were to be printed, and fall back to the convert-to-ps
toolchain otherwise.  Effectively, this meant that printing on
windows without showing the annotations was not possible (because
on windows only the QPrinter can be used for printing).

Starting with poppler 0.60, there is a way to disable annotation
rendering for the renderToImage and renderToPainter methods that
are used by QPrinter.  This patch makes use of this new option,
making printing on windows without annotations possible.

Differential Revision: https://phabricator.kde.org/D7688
 2017-09-07 10:41:22 +02:00
Kevin Funk
a53a2402ca clang-tidy: modernize-use-nullptr run 
Semi-ACK'd by Albert :)
 2017-09-06 00:19:48 +02:00
l10n daemon script
4be86a4bdc 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-09-04 04:41:43 +02:00
l10n daemon script
e56e08a781 GIT_SILENT made messages (after extraction) 2017-09-04 03:05:13 +02:00
Albert Astals Cid
b53c5dd02c Merge remote-tracking branch 'origin/Applications/17.08' 2017-09-02 19:57:12 +02:00
l10n daemon script
dbb801f25a 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-09-01 04:36:38 +02:00
l10n daemon script
910c06e4a6 GIT_SILENT made messages (after extraction) 2017-09-01 03:04:47 +02:00
Kevin Funk
b31e3f23db CMake: Use some more find_package(... CONFIG) 2017-08-31 23:37:19 +02:00
Albert Astals Cid
e18783f749 Fix warning about TRANSLATION_DOMAIN being defined twice 2017-08-30 23:08: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
l10n daemon script
7e5e26a16f 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-08-30 08:01:42 +02:00
l10n daemon script
74679c3668 GIT_SILENT made messages (after extraction) 2017-08-30 06:11:28 +02:00
Luigi Toscano
007030a6df Fix translation also for the new Markdown generator 
Define the translation domain for it as well.
 2017-08-30 01:29:43 +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
0f01012601 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-08-29 04:40:15 +02:00
Albert Astals Cid
39c76da6bf markdown: Obey the font size set in the settings 2017-08-27 12:04:47 +02:00
l10n daemon script
3349c9fff7 GIT_SILENT made messages (after extraction) 2017-08-27 05:21:29 +02:00
l10n daemon script
a6731c0ef4 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-08-27 04:42:43 +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
92a08d9a7d 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-08-26 04:45:47 +02:00
l10n daemon script
e279e26b40 GIT_SILENT made messages (after extraction) 2017-08-26 03:18:37 +02:00
l10n daemon script
003d46e926 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-08-25 04:48:47 +02:00
Albert Astals Cid
551f0b6271 Small rework for the markdown converter 
Don't have the textdocument and dir as members, pass them along
This is to make clear that this is a "one off stateless conversion",
i.e. after convert returns the converter doesn't own the textdocument
anymore, so better don't keep a pointer to it
 2017-08-25 01:14:58 +02:00
Julian Wolff
4931385777 add markdown support 
Summary:
Adds support for Markdown documents

BUG: 360603

Test Plan: Open a Markdown (.md) document in Okular

Reviewers: #okular, aacid

Reviewed By: #okular, aacid

Subscribers: michaelweghorn, aacid

Tags: #okular

Differential Revision: https://phabricator.kde.org/D7382
 2017-08-25 01:05:23 +02:00
Albert Astals Cid
37de97a030 Merge remote-tracking branch 'origin/Applications/17.08' 2017-08-21 00:11:28 +02:00
Oliver Sander
0c4c2ddbbc Print via QPrinter when rasterizing and printing annotations 
When the user chooses to print with rasterization and annotations,
it is easy to print directly to a QPrinter, rather than converting
to PostScript and then using CUPS tools.  The code for it was
already there, but it was hidden behind an #ifdef Q_OS_WIN.
This patch enables it for all plattforms.  If nothing else,
it will make an interesting debugging tool, because it allows
to bypass the postscript & CUPS toolchain from the GUI.
This may allow to track down some of the numerous my-printer-settings-
are-getting-ignored bugs.

The previously windows-only rasterization code used printer.physicalDpiX()
as the rasterization resolution.  At least on my machine this resulted
in a dpi value of 1200, which means quite a lot of memory is used.
I left the windows code untouched, but on Unix I lowered that value
to 300dpi, which is what the postscript rasterizer uses.

Incidentally, this patch does fix at least one bug for me:
Without it, my printer will happily ignore the 'print in grayscale'
button.  With the patch, that button is suddenly honoured.

REVIEW: 130218
 2017-08-10 17:27:27 +02:00
Andreas Sturmlechner
862fd4f3e1
Don't build kimgiotest unless BUILD_TESTING=ON 
Summary:
In >=KF-5.38 target kimgiotest is only built if BUILD_TESTING=ON,
so subsequent target_compile_definitions will fail if OFF.

Reviewers: #okular

Subscribers: kfunk

Tags: #okular

Differential Revision: https://phabricator.kde.org/D7212
 2017-08-09 00:47:12 +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
Albert Astals Cid
5e9d751c63 plucker: Comment code to reduce warnings 
upstream plucker is dead so no need to maitain code unchanged to ease merges
the variables were set but never used so for now commented them out
 2017-07-28 12:41:24 +02:00
Albert Astals Cid
f712504f6e Add a few make gcc lines 
It is needed because EOLCnt is set inside a macro used from various functions but the EOLCnt value
is then not really used in all of the functions so for those that are not used creates a "set but not used warning"
 2017-07-28 11:28:32 +02:00
Albert Astals Cid
a44b015761 Make newer gcc happier about fallthrough 2017-07-28 11:21:52 +02:00
Gilbert Assaf
786ec88526 Bug 236688 - Sort pages according to TOC in CHM Files 
All pages in a CHM File are now ordered accordingly to TOC Data. If a page is not in TOC, it will be added at the end.

Testing Done:
I created a small example chm file to test this. I can provide the file, if someone would like to have it.

Bugs closed: 236688

Reviewed at https://git.reviewboard.kde.org/r/130078/
 2017-05-31 13:13:48 +02:00
Gilbert Assaf
ff1647ce68 CHM: zooming changes the font size 
Transfers zoom handling from KHTML to KHTMLView and QImage.
This way the font now actually increases when you zoom in and zoom handling is more in line with the other generators.

Bugs closed: 164198

Reviewed at https://git.reviewboard.kde.org/r/130127/
 2017-05-31 13:12:41 +02:00
Gilbert Assaf
e876640c21 Bug 262265 chmlib should not send qFatal if encoding could not be guessed 
Okular sends a 'qFatal()', if no encoding could be guessed. This will also create a core dump crashing Okular and all open document in this instance.

Bugs closed: 262265

Reviewed at https://git.reviewboard.kde.org/r/130106/
 2017-05-31 13:02:20 +02:00
Gilbert Assaf
357f198c1e kio_msits emits mimetype again 
kio_msits emitting mimetype function ported to QT5. A kio slave should always emit the mimetype (see kio slave api doc).

Reviewed at https://git.reviewboard.kde.org/r/130113/
 2017-05-31 12:54:25 +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
Andreas Sturmlechner
1177c2e1a8 Merge branch 'Applications/17.04' 2017-04-23 00:11:28 +02:00
Andreas Sturmlechner
3ed10b8ccf Fix typo 2017-04-22 12:55:48 +02:00
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"
 2017-04-22 05:08:45 +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
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"
 2017-04-09 05:11:50 +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
dd71abcf47 cmake: Remove endif that doesn't match opening if 
Thanfully they fixed this crazyness a while ago
 2017-04-06 22:14:01 +02:00
Tobias Deiminger
0957abc39a Add annotation resize functionality 
Usage:
If you left-click an annotation, it gets selected. Resize handles appear on the selection rectangle. When cursor is moved over one of the 8 resize handles on the corners/edges, the cursor shape changes to indicate resize mode. Everywhere else on the annotation means "move", just as it was before resize feature was added. Pressing ESC or clicking an area outside the annotation cancels a selection. Pressing Del deletes a selected annotation.

Feature is only applicable for annotation types AText, AStamp and AGeom.

Implementation:
It works by eventually changing AnnotationPrivate::m_boundary and notifying generator (i.e. poppler) about that change. Annotation state handling is shifted out of PageView into a new class MouseAnnotation (ui/pageviewmouseannotation.cpp). Some functionality not related to resizing but to annotation interaction in general is also shifted to class MouseAnnotation, to build a single place of responsiblity.

Other changes:
Add method Document::adjustPageAnnotation, backed by a QUndoCommand.
class Okular::AdjustAnnotationCommand.
Add Annotation::adjust and Annotation::canBeResized methods.
Draw resize handles in PagePainter::paintCroppedPageOnPainter.

Resize and move work
-for types AText, AStamp and AGeom
-on all pages of document
-when viewport position changes
-when zoom level changes
-for all page rotations (0°, 90°, 180°, 270°)

Selection is canceled
-when currently selected annotation is deleted
-on mouse click outside of currently selected annotation
-ESC is pressed

Viewport is shifted when mouse cursor during move/resize comes close to viewport border.
Resize to negative is prevented.
Tiny annotations are still selectable.
If mouse is moved over an annotation type that we can focus, and the annotation is not yet focused, mouse cursor shape changes to arrow.
If mouse cursor rests over an annotation A, while annotation B is focused, a tooltip for annotation A is shown.
Selected Annotation is deleted when Del is pressed.

Test for regressions:
-Annotation interaction (focus, move, resize, start playback, ...) are only done in mode EnumMouseMode::Browse.
-If mouse is moved over an annotation type where we can start an action, mouse cursor shape changes to pointing hand.
-If mouse is moved over an annotation type that we can't interact with, mouse cursor shape stays a open hand.
-If mouse cursor rests over an annotation of any type, a tooltip for that annotation is shown.
-Grab/move scroll area (on left click + mouse move) is prevented, if mouse is over focused annotation, or over AMovie/AScreen/AFileAttachment annotation.
-A double click on a annotation starts the "annotator".

REVIEW: 127366
BUG: 177778
BUG: 314843
BUG: 358060
 2017-03-19 23:18:17 +01:00
Albert Astals Cid
f06bf612d7 Merge remote-tracking branch 'origin/Applications/16.12' 2017-03-05 19:53:10 +01:00
Albert Astals Cid
0419812ad7 djvu: Initialize to white if rendering fails 
It's what ddjvu does, and also it's not nice to return an uninitialzed image back to the user

BUGS: 377202
 2017-03-05 19:51:29 +01:00
Albert Astals Cid
7da5adce57 indent++ 2017-03-05 19:35:16 +01:00
Albert Astals Cid
4573c7a646 Recalculate forms after other are edited 
BUGS: 376958
 2017-03-03 01:08:44 +01:00
Albert Astals Cid
20a81c9de0 Set the Okular Form additional actions from the poppler Form additional actions 2017-03-03 01:00:09 +01:00
Albert Astals Cid
c80b59f1de I said use new API 2017-03-02 22:03:46 +01:00
Albert Astals Cid
b4ac0be485 Use the new API 2017-03-02 22:00:27 +01:00
Albert Astals Cid
ec70995895 QString as key is evil, add a nice enum 2017-03-02 21:04:59 +01:00
Albert Astals Cid
e72d2f5357 virtual override -> override 2017-03-02 20:40:09 +01:00
Albert Astals Cid
191a37fb52 Q_DECL_OVERRIDE -> override 2017-03-02 20:39:24 +01:00
Albert Astals Cid
4072eb0c3a Add override 2017-03-02 20:38:50 +01:00
Albert Astals Cid
0329e29779 Merge remote-tracking branch 'origin/Applications/16.12' 2017-02-28 00:26:36 +01:00
Albert Astals Cid
6874317c8a Fix crash on CHM files that use "plain English" LCID 
BUGS: 376936
 2017-02-28 00:25:20 +01:00
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"
 2017-02-26 07:52:08 +01:00
l10n daemon script
15543ea8bd GIT_SILENT made messages (after extraction) 2017-02-26 06:49:42 +01:00
Christoph Feck
7a013e3869 Require KHtml only when building CHM generator 
Reviewed by: aacid

Differential Revision: D4507
 2017-02-10 02:57:06 +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
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"
 2017-02-06 07:51:00 +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
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"
 2017-02-02 07:40:34 +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
Albert Astals Cid
ed4a9f42f4 Merge remote-tracking branch 'origin/Applications/16.12' 2017-01-16 00:37:25 +01:00
Albert Astals Cid
f467807506 Remove #ifdefs for Qt we require in cmake anyway 2017-01-16 00:36:08 +01:00
Martin T. H. Sandsmark
033f21c826 Port some missing debug output to categorized logging 2017-01-14 19:15:26 +01:00
l10n daemon script
a8a6268183 GIT_SILENT made messages (after extraction) 2017-01-10 08:01:20 +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
4290dffb1b GIT_SILENT made messages (after extraction) 2016-12-26 06:45:49 +01:00
l10n daemon script
30993aa3f1 GIT_SILENT made messages (after extraction) 2016-12-26 03:41:57 +01:00
Albert Astals Cid
195c99e090 Merge remote-tracking branch 'origin/Applications/16.12' 2016-12-22 23:12:23 +01:00
Albert Astals Cid
cac397dd27 Fix wrong porting 
We left the code for poppler < 0.22 when we should have left the other since for Qt5 poppler is always > 0.22

BUGS: 374028
 2016-12-22 23:11:44 +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
l10n daemon script
b6614c4da4 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-12 05:17:25 +01:00
l10n daemon script
6bc9feaba4 GIT_SILENT made messages (after extraction) 2016-12-12 04:38:06 +01:00
l10n daemon script
4952893372 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-12 03:58:04 +01:00
l10n daemon script
e798a92c06 GIT_SILENT made messages (after extraction) 2016-12-12 02:39:28 +01:00
l10n daemon script
4ed39dfc16 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-09 05:11:11 +01:00
l10n daemon script
8c2120e2d3 GIT_SILENT made messages (after extraction) 2016-12-09 04:31:33 +01:00
l10n daemon script
0d6f6edf60 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-09 03:56:48 +01:00
l10n daemon script
31da71cdec GIT_SILENT made messages (after extraction) 2016-12-09 02:36:45 +01:00
l10n daemon script
55f69270ca GIT_SILENT made messages (after extraction) 2016-12-03 13:56:24 +01:00
l10n daemon script
9f34f51ec1 GIT_SILENT made messages (after extraction) 2016-12-03 02:50:03 +01:00
l10n daemon script
5282d434ee 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-02 05:48:46 +01:00
l10n daemon script
56759cd0b3 SVN_SILENT made messages (after extraction) 2016-12-02 05:11:22 +01:00
l10n daemon script
dcb3edcf30 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-02 04:33:12 +01:00
l10n daemon script
4c8280e461 SVN_SILENT made messages (after extraction) 2016-12-02 03:21:51 +01:00
l10n daemon script
fa74d6eea7 SVN_SILENT made messages (after extraction) 2016-12-01 02:51:26 +01:00
l10n daemon script
297795d40d 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-11-30 04:27:22 +01:00
l10n daemon script
e65f2c6f62 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-11-29 05:41:48 +01:00
l10n daemon script
fecf0a8de6 SVN_SILENT made messages (after extraction) 2016-11-29 05:04:44 +01:00
l10n daemon script
fe628b9dbf 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-11-29 04:25:46 +01:00
l10n daemon script
96fd8111c1 SVN_SILENT made messages (after extraction) 2016-11-29 03:09:19 +01:00
l10n daemon script
5527fe1d44 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-11-28 05:28:46 +01:00
l10n daemon script
43cde01ced SVN_SILENT made messages (after extraction) 2016-11-28 04:44:19 +01:00
l10n daemon script
3fe1bef3d6 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-11-28 04:07:25 +01:00
l10n daemon script
f505e51b32 SVN_SILENT made messages (after extraction) 2016-11-28 02:53:18 +01:00
Hrvoje Senjan
50aa7d41d6 Compile with poppler < 0.50.0 
CCMAIL: aacid@kde.org
 2016-11-27 14:03:17 +01:00
Albert Astals Cid
6e4bccc7a0 Compile++ 2016-11-26 16:46:55 +01:00
Albert Astals Cid
ae69198454 wops, extra "a" 2016-11-26 16:26:16 +01:00
Albert Astals Cid
2868e3e5ca Support SetOCGState links 
Needs a very recent poppler

BUGS: 368402
REVIEW: 129216
 2016-11-26 16:00:46 +01:00
l10n daemon script
5d3508c112 SVN_SILENT made messages (after extraction) 2016-11-25 05:48:54 +01:00
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"
 2016-11-25 05:01:26 +01:00
l10n daemon script
854d997fd5 SVN_SILENT made messages (after extraction) 2016-11-25 03:12:40 +01:00
l10n daemon script
5ddc51b6c3 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-11-23 05:41:42 +01:00
l10n daemon script
6aaf19e884 SVN_SILENT made messages (after extraction) 2016-11-23 04:59:06 +01:00
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"
 2016-11-23 04:21:05 +01:00
l10n daemon script
d075df4eb0 SVN_SILENT made messages (after extraction) 2016-11-23 02:56:17 +01:00
l10n daemon script
7cb74091e3 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-11-22 06:10:26 +01:00
l10n daemon script
a1fbd54673 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-11-21 05:41:15 +01:00