l10n daemon script
f3c17e11bb
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
Laurent Montel
0d432e57ab
GIT_SILENT: Prepare 5.12.0 rc
7 years ago
l10n daemon script
79cb46cd6f
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
1969453765
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
e7098d489e
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
625552bce0
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
21d6eca4d8
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
d12cdedfe8
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
David Faure
60f4a19643
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago
David Faure
c3f90f8a34
Cleanup now unused DBUS/Mailer code
7 years ago
l10n daemon script
fee4e49043
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
f69f6ccaf6
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
David Faure
d965fd84ad
Merge branch 'Applications/19.08'
7 years ago
David Faure
d910cd4e22
Check if KMail is running before calling it, to avoid autostarting it at kontact startup
7 years ago
David Faure
fa0b49bfa2
Merge branch 'Applications/19.08'
7 years ago
David Faure
d3fe5ab1cf
Provide DBus activation file for kmail
...
Testcase: now this can be used to start kmail and wait until it registers to DBus:
$ qdbus org.kde.kmail
Longer term use case: KDBusServiceStarter can be ported to DBus
activation (in the far future).
7 years ago
David Faure
c42ef6f0de
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago
David Faure
ffab00e6f1
Remove wrong use of DBUS/Mailer servicetype
...
(found by grepping)
7 years ago
Allen Winter
201eac97eb
summaryview_part.h - fix build by including QMap
7 years ago
Laurent Montel
0b987ab8d5
GIT_SILENT: Prepare 5.12.0 rc
7 years ago
Laurent Montel
d2fc2fee12
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago
Laurent Montel
43ce4f311a
Fix apps name
...
Bug reported by Jonathan Riddell
7 years ago
Allen Winter
28a8cf907b
summaryview_part.h - fix build by including QMap
7 years ago
Laurent Montel
d630da46aa
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago
Laurent Montel
ec37c30f99
GIT_SILENT: Coding style
7 years ago
l10n daemon script
afbb0f0e32
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
c7f28b6693
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
Laurent Montel
9b2831ad7c
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago
Laurent Montel
a5fcebf789
Remove tipofday group
7 years ago
Laurent Montel
6b050fba84
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago
Laurent Montel
75b4b9cd70
Reduce duplicate code
7 years ago
Laurent Montel
99c3ef36f9
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago
Laurent Montel
7a1cacdf25
Switch to next page when we finish clean up
7 years ago
Laurent Montel
11913464a3
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago
Laurent Montel
cc3a978663
Clean up more settings
7 years ago
Laurent Montel
6317d93274
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago
Laurent Montel
904b3ba562
Send info message to finish page
7 years ago
Laurent Montel
eced3f8b6b
GIT_SILENT: 19.12 is open
7 years ago
Laurent Montel
b8ceb92ada
Hide desktop file
7 years ago
l10n daemon script
836aef5aeb
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
fe85527940
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
Laurent Montel
d4175e5a8f
GIT_SILENT: Prepare 5.11.80 (19.08.0 beta)
7 years ago
Laurent Montel
408cd84a9b
GIT_SILENT: Increase dependancy as discussed in release-team@
7 years ago
l10n daemon script
4887ccb6f4
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
Luigi Toscano
23d0ee34bf
Fix the capitalization of "KMail"
7 years ago
Laurent Montel
02a7cf28ce
GIT_SILENT: Prepare 5.11.80 (19.08.0 beta)
7 years ago
l10n daemon script
4b9cce52ba
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
Laurent Montel
dcdef3d5c1
Add signal
7 years ago
Laurent Montel
040ba6b2c4
continue to implement cleanup folder settings
7 years ago
l10n daemon script
2e151a07f8
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