Gilbert Assaf
357f198c1e
kio_msits emits mimetype again
...
kio_msits emitting mimetype function ported to QT5. A kio slave should always emit the mimetype (see kio slave api doc).
Reviewed at https://git.reviewboard.kde.org/r/130113/
9 years ago
l10n daemon script
bb8c12d1eb
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
767a1c0eac
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
58d23a20ae
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
bfe1f62eb5
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
ef9ea64bc3
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
cd1d36df29
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
94fbca1c95
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
a25642c178
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
91e740c236
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
dc104a44dc
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
cce5cf2592
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
Albert Astals Cid
191a37fb52
Q_DECL_OVERRIDE -> override
9 years ago
Albert Astals Cid
4072eb0c3a
Add override
9 years ago
Albert Astals Cid
6874317c8a
Fix crash on CHM files that use "plain English" LCID
...
BUGS: 376936
9 years ago
l10n daemon script
5b7a8d3d67
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
15543ea8bd
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
c55c44ed95
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
2a0bdca687
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
963ce79c45
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
7381616690
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
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
0922f2f524
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
0e1cf0fbb9
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
0cbf1d24e7
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
Martin T. H. Sandsmark
7f3eebd9f3
Only show warning messages by default
...
REVIEW: 129832
9 years ago
l10n daemon script
e44b17080a
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
93b824de9e
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
4290dffb1b
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
30993aa3f1
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
fb77e0d1fd
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
006cb782a2
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
20f6524016
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
b6614c4da4
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
6bc9feaba4
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
4952893372
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
e798a92c06
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
4ed39dfc16
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
8c2120e2d3
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
0d6f6edf60
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
31da71cdec
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
5282d434ee
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
56759cd0b3
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
dcb3edcf30
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
4c8280e461
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
fa74d6eea7
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
297795d40d
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
e65f2c6f62
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
fecf0a8de6
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
fe628b9dbf
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