office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-19 07:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
8220 commits 137 branches 359 tags 72 MiB
Commit graph

60 commits

Author SHA1 Message Date
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
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
Sune Vuorela 3e48663fb7 Use a target in FindDiscount (modern cmake) rather than variables 
Test Plan: Things still builds

Reviewers: kde-buildsystem, apol

Reviewed By: apol

Subscribers: apol, aacid, #okular

Tags: #okular

Differential Revision: https://phabricator.kde.org/D12672
 2018-05-08 21:39:06 +02:00
l10n daemon script ee57925c57 GIT_SILENT made messages (after extraction) 2018-05-06 06:09:02 +02:00
Sune Vuorela 13bdb97084 Don't crash if fopen fails 
Summary:
If we have a qrc url, all checks so far fails, and this one returns null.

It might also be possible to get here in some race condition.

Reviewers: aacid

Reviewed By: aacid

Subscribers: #okular

Tags: #okular

Differential Revision: https://phabricator.kde.org/D12643
 2018-05-01 22:24:24 +02:00
l10n daemon script 0d38577b4a 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-02-08 05:11:36 +01:00
l10n daemon script 37a30f5851 GIT_SILENT made messages (after extraction) 2018-02-08 03:27:11 +01: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 daaa084476 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-15 04:46:05 +01:00
l10n daemon script 553d69dcef GIT_SILENT made messages (after extraction) 2018-01-15 03:10:59 +01:00
l10n daemon script f1e2ebbaed 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-11 04:50:21 +01:00
l10n daemon script 6ff1864dc2 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-08 04:48:31 +01:00
l10n daemon script a16d67e85a GIT_SILENT made messages (after extraction) 2018-01-08 03:09:23 +01:00
l10n daemon script c5bb0a0941 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-04 04:43:49 +01:00
l10n daemon script bbf4bd0bdc GIT_SILENT made messages (after extraction) 2017-12-04 03:08: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
l10n daemon script 379edd6757 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-27 07:00:46 +01:00
l10n daemon script cdf2921e32 GIT_SILENT made messages (after extraction) 2017-11-27 05:54:12 +01:00
l10n daemon script 7eaa3cb659 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-17 06:38:51 +01:00
l10n daemon script d6e1a6808d GIT_SILENT made messages (after extraction) 2017-11-17 05:44:04 +01:00
l10n daemon script 75604b10ea 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-24 05:11:28 +02:00
l10n daemon script 1883a06614 GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +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 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
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
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
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
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
Albert Astals Cid e18783f749 Fix warning about TRANSLATION_DOMAIN being defined twice 2017-08-30 23:08:48 +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