office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-24 18:35:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
10556 commits 142 branches 358 tags 105 MiB
Commit graph

215 commits

Author SHA1 Message Date
l10n daemon script 0fbe40dfb4 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-13 05:25:02 +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
l10n daemon script 96b9fa1ef4 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-11 04:52:16 +02:00
Natsumi Higa 5a8d21d597 Add support for cb7 comic book archives 
Test Plan: Open a cb7 file (e.g. [[ https://bugs.kde.org/attachment.cgi?id=122002 | Attachment 122002 ]] from [[ https://bugs.kde.org/show_bug.cgi?id=410696 | Bug 410696 ]]) using Okular and see if it works.

Reviewers: #okular, aacid

Subscribers: broulik, pino, okular-devel

Tags: #okular

Differential Revision: https://phabricator.kde.org/D23037
 2019-08-10 11:45:13 +02: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 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 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 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 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 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 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 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 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 62eea3336b Merge remote-tracking branch 'origin/master' into frameworks 2016-10-29 11:13:24 +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
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
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
l10n daemon script dde68921b6 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-13 04:04:10 +00:00
l10n daemon script f6d4b45650 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-10 05:23:01 +00:00
l10n daemon script 2669a2f354 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-08 05:32:59 +00:00
l10n daemon script 2b1cf29728 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-06 04:39:34 +00:00
l10n daemon script 6a2b5fc7b8 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-04 03:59:45 +00:00
l10n daemon script 79fa933c73 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-03 04:18:26 +00:00
l10n daemon script ef99f17efb 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-02 03:58:51 +00:00
l10n daemon script 8703484e63 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-01 05:00:47 +00:00
l10n daemon script 7be388fa0f 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-08-31 04:47:52 +00:00
Albert Astals Cid ab8944dcce Add Comment 
BUGS: 351973
 2015-08-30 16:43:39 +02:00
Montel Laurent 61628e5bc7 Merge remote-tracking branch 'origin/master' into frameworks 
Conflicts:
	part.cpp
 2015-02-07 13:12:59 +01:00
l10n daemon script 557b5447a5 SVN_SILENT made messages (.desktop file) 2015-01-21 03:53:40 +00:00
l10n daemon script 9a3672b255 SVN_SILENT made messages (.desktop file) 2014-12-26 04:18:45 +00:00
l10n daemon script e6ef3cb64b SVN_SILENT made messages (.desktop file) 2014-12-25 04:05:24 +00:00
Montel Laurent 8f5e86cec5 Merge remote-tracking branch 'origin/master' into frameworks 
Conflicts:
	core/version.h
 2014-11-30 12:56:10 +01:00
l10n daemon script be1ad62df7 SVN_SILENT made messages (.desktop file) 2014-11-15 04:10:57 +00:00
Montel Laurent 17a55c6dab Merge remote-tracking branch 'origin/master' into frameworks 
Conflicts:
	CMakeLists.txt
	core/document.cpp
	generators/poppler/CMakeLists.txt
	generators/poppler/generator_pdf.cpp
	generators/poppler/generator_pdf.h
 2014-10-09 07:34:35 +02:00
l10n daemon script d9a48c888a SVN_SILENT made messages (.desktop file) 2014-10-09 04:05:29 +00:00
Jeremy Whiting 83299b9532 Remove %i from .desktop files which added --icon to exec line. 
Since Okular no longer uses KApplication it no longer handles --icon parameters.
 2014-10-07 16:41:59 -06:00
Montel Laurent 927e7a9a19 Merge remote-tracking branch 'origin/KDE/4.14' into frameworks 2014-10-01 07:29:17 +02:00
l10n daemon script 3588634833 SVN_SILENT made messages (.desktop file) 2014-09-30 09:11:55 +00:00
l10n daemon script 8365cf2873 SVN_SILENT made messages (.desktop file) 2014-09-30 04:39:47 +00:00
Frederik Gladhorn f7d1dd9312 Remove -caption %c from .desktop files 
BUGS: 338264
 2014-09-17 20:16:49 +02:00
l10n daemon script 896de56ef0 SVN_SILENT made messages (.desktop file) 2014-07-25 05:38:42 +00:00
l10n daemon script 1b5cbbea59 SVN_SILENT made messages (.desktop file) 2014-07-24 04:51:37 +00:00
l10n daemon script 6a46dd7447 SVN_SILENT made messages (.desktop file) 2014-06-30 04:40:38 +00:00
l10n daemon script db0de0d550 SVN_SILENT made messages (.desktop file) 2013-08-15 04:02:23 +00:00
l10n daemon script d773e626a9 SVN_SILENT made messages (.desktop file) 2013-08-04 04:26:31 +00:00
l10n daemon script 4e84194bef SVN_SILENT made messages (.desktop file) 2013-07-24 04:05:35 +00:00
l10n daemon script 2e847d2f81 SVN_SILENT made messages (.desktop file) 2013-07-01 03:53:16 +00:00
l10n daemon script 99a74074f4 SVN_SILENT made messages (.desktop file) 2013-05-30 04:28:22 +00:00
David Faure 155312269b Remove erroneous double-quotes around %c in Exec line 2013-05-03 13:25:44 +02:00
Script Kiddy cbc693b664 SVN_SILENT made messages (.desktop file) 2013-04-20 09:48:58 +02:00
Script Kiddy a034e086e5 SVN_SILENT made messages (.desktop file) 2013-02-08 08:27:14 +01:00
Script Kiddy ba79674de9 SVN_SILENT made messages (.desktop file) 2013-02-05 16:52:55 +01:00
Script Kiddy 472d8d1480 SVN_SILENT made messages (.desktop file) 2013-01-31 11:56:49 +01:00
Script Kiddy a4a7d5039d SVN_SILENT made messages (.desktop file) 2013-01-17 08:12:57 +01:00
Script Kiddy 45c8af8151 SVN_SILENT made messages (.desktop file) 2013-01-15 20:29:31 +01:00
Script Kiddy 94a3df94f8 SVN_SILENT made messages (.desktop file) 2013-01-10 12:21:24 +01:00
Script Kiddy 999d89b0be SVN_SILENT made messages (.desktop file) 2012-12-28 07:43:16 +01:00
Script Kiddy 341c0bc7f2 SVN_SILENT made messages (.desktop file) 2012-12-24 09:00:24 +01:00
Script Kiddy d4aceee67e SVN_SILENT made messages (.desktop file) 2012-12-23 07:56:06 +01:00
Script Kiddy 79f95f3086 SVN_SILENT made messages (.desktop file) 2012-12-22 08:08:47 +01:00
Script Kiddy b38206612c SVN_SILENT made messages (.desktop file) 2012-11-20 15:21:13 +01:00
Script Kiddy 02893a5d74 SVN_SILENT made messages (.desktop file) 2012-10-29 09:48:52 +01:00
Script Kiddy e653d83816 SVN_SILENT made messages (.desktop file) 2012-08-07 18:30:47 +02:00
Script Kiddy dc6823c135 SVN_SILENT made messages (.desktop file) 2012-06-24 10:17:10 +02:00
Script Kiddy d41c8bd1c7 SVN_SILENT made messages (.desktop file) 2012-06-12 17:04:54 +02:00
Script Kiddy d7e2453a4d SVN_SILENT made messages (.desktop file) 2012-05-05 10:45:59 +02:00
Script Kiddy 00fdc61daa SVN_SILENT made messages (.desktop file) 2012-04-11 09:35:46 +02:00
Script Kiddy 5778a66e7c SVN_SILENT made messages (.desktop file) 2012-02-16 10:52:04 +01:00
Script Kiddy 5cfe3b8575 SVN_SILENT made messages (.desktop file) 2012-02-05 09:41:48 +01:00
Script Kiddy 76f96438e7 SVN_SILENT made messages (.desktop file) 2012-01-29 11:39:01 +01:00
Script Kiddy 92360f704a SVN_SILENT made messages (.desktop file) 2011-12-21 09:59:21 +01:00
Script Kiddy ee684dc516 SVN_SILENT made messages (.desktop file) 2011-12-20 16:26:22 +01:00
Script Kiddy 16d92557a0 SVN_SILENT made messages (.desktop file) 2011-12-19 15:36:45 +01:00
Script Kiddy 417e8b0359 SVN_SILENT made messages (.desktop file) 2011-12-17 09:46:38 +01:00
Script Kiddy e56df195f0 SVN_SILENT made messages (.desktop file) 2011-12-13 15:52:26 +01:00
Script Kiddy 6715c207e8 SVN_SILENT made messages (.desktop file) 2011-12-11 08:38:07 +01:00
Script Kiddy 6af2062d72 SVN_SILENT made messages (.desktop file) 2011-12-08 09:04:23 +01:00
Script Kiddy 2d70239ee3 SVN_SILENT made messages (.desktop file) 2011-12-07 09:23:18 +01:00
Script Kiddy cfd881c2ee SVN_SILENT made messages (.desktop file) 2011-08-16 15:21:46 +02:00
Script Kiddy 84cc400fd0 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdegraphics/okular/; revision=1231700
 2011-05-13 07:09:13 +00:00
Script Kiddy b815d7356d SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdegraphics/okular/; revision=1231185
 2011-05-10 10:01:23 +00:00
Script Kiddy 805a8e7f89 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdegraphics/okular/; revision=1230986
 2011-05-09 07:42:08 +00:00
Script Kiddy 64b8965b35 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdegraphics/okular/; revision=1230852
 2011-05-08 07:37:44 +00:00
Script Kiddy 1b38da667b SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdegraphics/okular/; revision=1230663
 2011-05-06 07:24:37 +00:00
David Faure 605c31e27c Make executable the Type=Application .desktop files we install, 
so that they can be used even from a KDE running in another prefix (http://markmail.org/message/4p3krovtnzwx35zd)

svn path=/trunk/KDE/kdegraphics/okular/; revision=1182571
 2010-10-04 23:51:07 +00:00
Script Kiddy 34cef01317 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdegraphics/okular/; revision=1150134
 2010-07-15 07:11:30 +00:00
Script Kiddy ff913d232f SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdegraphics/okular/; revision=1108213
 2010-03-28 07:14:45 +00:00