Albert Astals Cid
f7f2b3105f
Increase version here too
2019-12-05 23:50:27 +01:00
Christoph Feck
7974aa1d36
Update Appstream for new release
2019-12-05 22:05:15 +01:00
Albert Astals Cid
da21543a50
Small performance improvements
2019-10-05 22:16:43 +02:00
l10n daemon script
bf7a53d62b
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"
2019-08-12 05:10:27 +02:00
Laurent Montel
cb691f70dc
Fix some clazy warning
...
Summary: fix clazy warning
Reviewers: aacid
Reviewed By: aacid
Subscribers: nicolasfella, okular-devel
Tags: #okular
Differential Revision: https://phabricator.kde.org/D20832
2019-05-27 08:02:57 +02:00
l10n daemon script
a7742d4604
GIT_SILENT made messages (after extraction)
2019-05-22 03:10:30 +02:00
l10n daemon script
aaa176041d
GIT_SILENT made messages (after extraction)
2019-02-16 03:14:15 +01:00
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"
2019-02-10 05:27:14 +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
39b6e8147d
Fix minor EBN issues
2018-09-01 11:25:57 +03: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
c4570f7e40
GIT_SILENT made messages (after extraction)
2018-07-16 03:26:51 +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
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
Albert Astals Cid
f621cd0c42
Add a few overrides
2017-11-03 15:20:01 +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
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
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
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
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
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
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
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
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
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
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
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
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"
2016-11-21 04:18:14 +01:00
l10n daemon script
2e65d70f63
SVN_SILENT made messages (after extraction)
2016-11-21 03:03:57 +01:00
l10n daemon script
d89ad9053a
SVN_SILENT made messages (after extraction)
2016-11-19 03:34:19 +00:00
l10n daemon script
ae6961a63c
SVN_SILENT made messages (after extraction)
2016-11-17 17:55:17 +00:00
l10n daemon script
b0024f05c7
SVN_SILENT made messages (after extraction)
2016-11-15 07:55:46 +00:00
l10n daemon script
3898a99a8f
SVN_SILENT made messages (after extraction)
2016-11-13 13:59:19 +00:00
l10n daemon script
36befe7161
SVN_SILENT made messages (after extraction)
2016-11-12 13:58:17 +00:00
l10n daemon script
3107e544b4
SVN_SILENT made messages (after extraction)
2016-11-11 07:16:25 +00:00
Burkhard Lück
4b7455396e
add metadata for kimgio, mobipocket, ooo, plucker, poppler, spectre, txt, xps
...
REVIEW:129347
BUG:363842
2016-11-09 11:30:19 +01:00
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"
2016-11-09 09:19:08 +00:00
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"
2016-11-08 10:00:59 +00:00
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"
2016-11-07 09:47:04 +00:00
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"
2016-11-06 09:39:30 +00:00
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"
2016-11-05 10:00:05 +00:00
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"
2016-11-04 09:43:54 +00:00
Luigi Toscano
58b2f0e1f0
Use QMobipocket >= 2 (Qt5 based)
...
Use the new way of finding it, as include and libraries directories
are not exported, but the target information are and can be used through
target_link_libraries..
2016-10-29 18:07:30 +02:00
Albert Astals Cid
62eea3336b
Merge remote-tracking branch 'origin/master' into frameworks
2016-10-29 11:13:24 +02:00
Olivier CHURLAUD
3b608a66c9
Preview functions again.
...
I added again the okularXXX.desktop
Correct the mess done by review 126193
2016-07-21 23:05:54 +02:00
Olivier CHURLAUD
ef6f5ebc3b
Porting more files out of KDialog
2016-07-21 21:53:54 +02:00
Martin T. H. Sandsmark
2b473fedbd
generators: Fix build without implicit cast to/from ascii
...
See previous commit for details.
2016-07-11 21:59:14 +02:00
Bhushan Shah
6fd7509730
somehow this still needs KDELibs4Support
...
Gives following error otherwise,
/usr/include/qmobipocket/qmobipocket_export.h:22:23: fatal error: kdemacros.h: No such file or directory
compilation terminated.
2016-06-27 14:55:03 +05:30
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"
2016-06-25 03:22:57 +00:00
Martin T. H. Sandsmark
b2ffcab043
Fix build of mobipocket backend
2016-06-18 19:34:55 +02:00
Aleix Pol
32b62e919a
Remove most KDELibs4Support linking
...
Ports away from KFileDialog.
Stops linking to KDELibs4Support from objects that don't need it.
REVIEW: 127021
2016-05-31 00:13:36 +02:00
Albert Vaca
67f69c8871
Merge branch 'master' into frameworks
...
# Conflicts:
# CMakeLists.txt
# active/app/package/metadata.desktop
# conf/widgetannottools.cpp
# core/version.h
# generators/poppler/libokularGenerator_poppler.desktop
# generators/txt/libokularGenerator_txt.desktop
# generators/xps/libokularGenerator_xps.desktop
# ui/annotationwidgets.cpp
# ui/presentationwidget.cpp
2016-02-22 03:50:54 -08:00
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"
2016-01-18 04:45:59 +00:00
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"
2016-01-09 03:25:47 +00:00
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"
2016-01-05 04:07:32 +00:00
Alex Richardson
00b15528a4
Add the Copyright information back to the JSON files
...
REVIEW: 126193
2016-01-04 15:59:07 +01:00