l10n daemon script
59d76deec6
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
01a9a6fe46
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
e0ea9fd04c
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
50c2cebdd6
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
3953f3e0bf
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
91612fcb55
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
a75e26c5af
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
c2b4350521
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
0fd9c4d9af
GIT_SILENT made messages (after extraction)
6 years ago
Nicolas Fella
f9471ba01a
Add icons to desktop file actions
...
Summary: This allows Plasma to show icons in the taskmanager/startmenu actions
Test Plan: {F7304489}
Reviewers: #falkon, cullmann
Reviewed By: #falkon, cullmann
Subscribers: cullmann, falkon
Tags: #falkon
Differential Revision: https://phabricator.kde.org/D23631
7 years ago
l10n daemon script
6f1c729906
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
026320183c
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
0c10c30986
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
24434a05a7
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
44730ae16d
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
eb3e966363
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
a8ac59dc55
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
44c85c7f65
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
2887d87ed5
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
fbf7f956ff
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
fb19df1aa2
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
8e57d0895c
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
01f3c3d376
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
bde26dc861
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
bdbd2127d6
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
bd99b40485
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
c3dce2aa80
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
9f393fe1ae
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
c32b899ae3
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
2860504d6b
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
9eb11111aa
GIT_SILENT made messages (after extraction)
7 years ago
Christoph Cullmann
5bb7e9cfcf
Add --wmclass argument to linux completion files
...
Reviewers: #falkon, drosca
Reviewed By: #falkon, drosca
Subscribers: cullmann, falkon
Tags: #falkon
Differential Revision: https://phabricator.kde.org/D18667
7 years ago
l10n daemon script
524697d139
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
caf1380774
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
8d321a72bf
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
0684603930
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
8f6054f788
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
5b831a3c8c
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
116ba93b79
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
5fb500465f
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
b44134fd07
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
82417ff4a5
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
e0d1175dd1
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
1500f2202a
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
0a744919e5
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
5ca5bc7384
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
06020d9615
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
1c6f5bd8e2
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
286f329109
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
086d572e25
GIT_SILENT made messages (after extraction)
8 years ago