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
..
CMakeLists.txt	Fix warning about TRANSLATION_DOMAIN being defined twice	2017-08-30 23:07:03 +02:00
converter.cpp	Fix minor EBN issues	2018-08-31 12:23:45 +03:00
converter.h	Q_DECL_OVERRIDE -> override	2017-03-02 20:39:24 +01:00
debug_txt.h	Fix minor EBN issues	2018-08-31 12:23:45 +03:00
document.cpp	Fix minor EBN issues	2018-08-31 12:23:45 +03:00
document.h	Fix minor EBN issues	2018-09-01 11:25:57 +03:00
generator_txt.cpp	Port to new JSON plugin loading system	2016-01-04 15:59:07 +01:00
generator_txt.h	Fix minor EBN issues	2018-08-31 12:23:45 +03:00
libokularGenerator_txt.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-24 05:59:57 +02:00
Messages.sh	Some i18n fixes	2013-05-19 10:59:43 +03:00
okularApplication_txt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:37:12 +02:00
okularTxt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:37:12 +02:00
org.kde.mobile.okular_txt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:37:12 +02:00
org.kde.okular-txt.metainfo.xml	GIT_SILENT made messages (after extraction)	2018-10-10 04:08:48 +02:00