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
7484 commits 138 branches 360 tags 104 MiB
Commit graph

404 commits

Author SHA1 Message Date
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
Albert Astals Cid
aa38e8d1b7 Fix xps url resolving porting regression 2016-10-29 18:39:50 +02:00
Albert Vaca
c71f308252 Fixes suggested by Clazy 2016-10-29 16:33:05 +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
Martin T. H. Sandsmark
d5bdca64d2 Fix low hanging unused parameters warnings 2016-07-11 22:57:11 +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
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
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
Alex Richardson
2f9246ae42 Port to new JSON plugin loading system 
This means Okular can now work without ksycoca and KDELibs4Support.

REVIEW: 126193
 2016-01-04 15:59:07 +01:00
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"
 2015-12-08 03:41:42 +00:00
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"
 2015-11-22 03:43:12 +00:00
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"
 2015-11-05 04:21:47 +00:00
Montel Laurent
466eb79615 Use QStringLiteral 2015-10-29 13:37:11 +01:00
Albert Astals Cid
8445660539 Merge remote-tracking branch 'origin/master' into frameworks 2015-10-18 22:29:00 +02:00
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"
 2015-10-18 04:25:21 +00:00
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"
 2015-10-12 04:04:13 +00:00
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"
 2015-10-08 04:21:25 +00:00
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"
 2015-09-26 04:04:15 +00:00
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"
 2015-09-21 03:49:52 +00:00
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"
 2015-09-15 05:00:52 +00:00