l10n daemon script
8b72dcb4b2
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"
3 years ago
l10n daemon script
adaef601ce
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"
3 years ago
l10n daemon script
9579a4540f
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"
3 years ago
l10n daemon script
804cadfb53
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"
4 years ago
l10n daemon script
04059bae4b
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"
4 years ago
Harald Sitter
8870f6074f
alias generator desktop files
...
this allows UIs to know that this is really okular and may show okular
instead (considering the generators are nodisplay=true)
specifically this allows the xdg-desktop-portal-kde to show okular in
its appchooser dialog even though the actual mimetype match happend
against (e.g.) okularApplication_pdf.desktop and is NoDisplay
(mobile curious has inconsistent naming, the main desktop file is
definitely org.kde.okular.kirigami.desktop)
4 years ago
l10n daemon script
7c87c702df
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"
5 years ago
l10n daemon script
7ae4288f35
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"
5 years ago
l10n daemon script
21f96680a6
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"
5 years ago
l10n daemon script
a225fb6d9a
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"
5 years ago
l10n daemon script
3dbe3b18f5
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"
5 years ago
l10n daemon script
6ad2ebdbbb
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"
5 years ago
l10n daemon script
724b9413e3
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"
5 years ago
l10n daemon script
74c92306b8
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"
5 years ago
l10n daemon script
dc74ffa68c
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"
5 years ago
l10n daemon script
3ef3de28c8
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"
6 years ago
l10n daemon script
7254c56886
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"
6 years ago
l10n daemon script
90502b2961
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"
6 years ago
l10n daemon script
1f50b2a6b4
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"
6 years ago
l10n daemon script
2857dc241f
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"
6 years ago
l10n daemon script
35e43602d4
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"
6 years ago
l10n daemon script
ef53790eba
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"
6 years ago
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"
6 years ago
Nicolas Fella
7d24a51e6a
Launch okularkirigami directly instead of via kpackagelauncherqml
6 years ago
l10n daemon script
a26dd5118a
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"
6 years ago
l10n daemon script
0d5bd0bc43
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"
6 years ago
l10n daemon script
b16dcf41aa
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"
7 years ago
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"
7 years ago
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"
8 years ago
l10n daemon script
d85fe1df64
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"
8 years ago
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"
8 years ago
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"
9 years ago
Marco Martin
1dd033d914
rename all the active specific desktop files
11 years ago
Marco Martin
af3b4cba17
use the new kpackage-based runtime for the QML app
...
remove old dead code, the okular active app is now completely
qml and KPackage based
11 years ago
l10n daemon script
41e35d5fd9
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
557b5447a5
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
9a3672b255
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
e6ef3cb64b
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
64fd5ea72c
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
be1ad62df7
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
14c7348690
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
d9a48c888a
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
3588634833
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
8365cf2873
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
896de56ef0
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
1b5cbbea59
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
d2131617d6
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
d62def2323
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
6a46dd7447
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
0efb152065
SVN_SILENT made messages (.desktop file)
12 years ago