office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-17 23:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
8591 commits 137 branches 359 tags 71 MiB
Commit graph

2191 commits

Author SHA1 Message Date
Christoph Feck a18c013932 GIT_SILENT Update Appstream for new release 2020-02-04 00:16:27 +01:00
l10n daemon script 134c16efdc 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"
 2020-01-31 09:40:26 +01:00
l10n daemon script 7e40267790 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"
 2020-01-17 10:22:33 +01:00
l10n daemon script 204653e2c3 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"
 2020-01-09 09:37:27 +01:00
Christoph Feck 475652a990 Update Appstream for new release 2020-01-06 14:55:05 +01:00
l10n daemon script 2fc22344e3 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"
 2020-01-03 09:44:10 +01:00
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
l10n daemon script 1f0048c125 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-11-24 09:11:36 +01:00
l10n daemon script 1850e8d1ec GIT_SILENT made messages (after extraction) 2019-11-24 07:54:36 +01:00
l10n daemon script 9e4c6cfb68 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-11-11 09:47:25 +01:00
l10n daemon script 35b7d057a2 GIT_SILENT made messages (after extraction) 2019-11-11 08:18:44 +01:00
l10n daemon script 2d90b6210c 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-11-03 05:15:02 +01:00
l10n daemon script ff7c93a600 GIT_SILENT made messages (after extraction) 2019-11-03 03:01:10 +01:00
Harald Sitter 235164b264 don't crahs on nullptr pdfOptionsPage 
same as in fbeff5ae7c there may not be
a pdfOptionsPage when using print preview.

this fixes an exciting crash on our windows build when tryint to print
preview
 2019-10-21 11:08:25 +02:00
l10n daemon script 9c1227a3bc 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-10-20 05:15:31 +02:00
l10n daemon script b77bcd3078 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-10-14 05:05:17 +02:00
l10n daemon script 527737711f 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-10-10 05:29:24 +02:00
l10n daemon script a90bf7fe02 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-10-09 05:35:12 +02:00
l10n daemon script 1943667775 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-10-08 05:22:18 +02:00
l10n daemon script af085affe4 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-10-07 05:05:01 +02:00
l10n daemon script c5e9de8931 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-10-06 05:23:07 +02:00
Albert Astals Cid da21543a50 Small performance improvements 2019-10-05 22:16:43 +02:00
l10n daemon script 92232d81ba 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-10-05 05:16:24 +02:00
Christoph Cullmann 34476a6301 merge 19.08 fixes to master 2019-10-04 20:22:30 +02:00
l10n daemon script cd26e23a33 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-09-29 08:45:21 +02:00
l10n daemon script 26c0a606d7 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-09-28 05:20:46 +02:00
l10n daemon script a9e0e49f43 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-09-25 08:58:56 +02:00
l10n daemon script 59f13d9bcf 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-09-25 05:23:48 +02:00
l10n daemon script 91e0ad9a9d 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-09-22 09:03:32 +02:00
Aleix Pol 40d32ae9a4 Fix compilation against a karchive that doesn't have lzma 
Fixes one of the problems with building for Android.
Note LZMA is an optional dependency for KArchive.
 2019-09-21 00:59:50 +02:00
Laurent Montel 8beef33c05 Port some deprecated methods 2019-09-18 13:41:19 +02:00
Laurent Montel db0f477119 Port deprecated QLayout::setMargin 2019-09-18 13:35:04 +02:00
l10n daemon script 86fba9df67 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-09-09 08:45:37 +02:00
l10n daemon script 7f97880667 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-09-09 05:09:03 +02:00
l10n daemon script 26c5d9c8de 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-09-07 09:12:13 +02:00
l10n daemon script e27209f430 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-09-06 09:19:00 +02:00
l10n daemon script 2dcf717c95 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-09-05 09:08:26 +02:00
l10n daemon script d647ff3b67 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-09-03 08:55:46 +02:00
l10n daemon script 10f9f30bf1 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-09-02 08:48:01 +02:00
l10n daemon script abfa0c7ed9 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-09-01 08:27:16 +02:00
l10n daemon script 674afc0250 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-31 08:50:23 +02:00
l10n daemon script 49e414444a 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-30 09:23:56 +02:00
l10n daemon script 774bcbc4ef 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-30 05:20:53 +02:00
l10n daemon script 2a3820aba1 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-26 05:02:04 +02:00
l10n daemon script 87f80c3418 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-18 05:05:25 +02:00
l10n daemon script 241e807bca 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-17 05:10:33 +02:00
l10n daemon script c2479a733b 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-16 05:11:44 +02:00
l10n daemon script df7a8d67e7 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-14 05:09:46 +02:00
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