l10n daemon script
326d314677
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
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
Nicolas Fella
3cc016b6ab
Drop empty X-KDE-PluginInfo-Depends
...
The whole concept is almost unused and there's no point in having it there but empty
See also https://phabricator.kde.org/T13553
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
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
Yuri Chornoivan
b510bb8f20
Update links to the dependencies
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
Bhushan Shah
0991819a49
Don't hide the mobile app
...
otherwise it doesn't get shown on Plasma Mobile as well, most
distribution doesn't enable mobile app or splits it in seperate package
so this should not be problem
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
Aleix Pol
5f8f84d53c
Turn okularkirigami into an executable
...
Summary:
Makes for straightforward Android testing and will work on normal
installations as well.
Reviewers: #kirigami, #okular, mart
Reviewed By: #kirigami, mart
Subscribers: plasma-devel
Tags: #kirigami, #okular
Differential Revision: https://phabricator.kde.org/D12176
8 years ago
Pino Toscano
9008803b32
remove deprecated Encoding key from desktop files
...
... even when only mentioned in apidox
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
l10n daemon script
191e10300d
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"
10 years ago
Martin T. H. Sandsmark
5e77764ac5
Don't show mobile version in menus
10 years ago
Marco Martin
5b5f0a0c8a
a message if no docs present
10 years ago
Marco Martin
5ba5e2189c
rename from active to mobile
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
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
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
9507028bc4
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
cf3ea3515e
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
l10n daemon script
514ef4a3ac
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
6f62e29846
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
4e84194bef
SVN_SILENT made messages (.desktop file)
13 years ago