l10n daemon script cc452498e5 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-06-09 09:16:32 +02:00
..
tests	CI: Enable clazy detaching-temporary	2020-02-19 23:44:41 +01:00
CMakeLists.txt	Fix warning about TRANSLATION_DOMAIN being defined twice	2017-08-30 23:07:03 +02:00
generator_kimgio.cpp	Merge branch 'dont-use-docdata-for-annots-and-forms' into Applications/17.12	2017-11-16 15:00:23 +01:00
generator_kimgio.h	CI: enable more modernize checks	2019-12-18 12:51:13 +01:00
libokularGenerator_kimgio.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-28 05:42:48 +01:00
Messages.sh	do not rely on extract-messages.sh doing the work for us	2010-08-21 16:43:14 +00:00
okularApplication_kimgio.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-09 09:16:32 +02:00
okularKimgio.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-09 09:16:32 +02:00
org.kde.mobile.okular_kimgio.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-09 09:16:32 +02:00
org.kde.okular-kimgio.metainfo.xml	GIT_SILENT Update Appstream for new release	2020-06-08 19:53:16 +02:00