Commit graph

443 commits

Author SHA1 Message Date
Albert Astals Cid 1a5e20e22b Merge remote-tracking branch 'origin/Applications/17.04' 2017-07-02 18:01:14 +02:00
Albert Astals Cid 3b5f19fd9d Shell: Fix sync "Show menubar" action status
No need to sync it when Shell uses a native menubar
2017-07-02 18:00:04 +02:00
l10n daemon script 1658d3b64e GIT_SILENT made messages (after extraction) 2017-06-30 03:08:40 +02:00
l10n daemon script 5af987dac0 GIT_SILENT made messages (after extraction) 2017-06-20 05:05:53 +02:00
Albert Astals Cid dc85379ce1 Merge remote-tracking branch 'origin/Applications/17.04' 2017-05-21 23:38:14 +02:00
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"
2017-05-21 05:48:05 +02:00
l10n daemon script 34edbb7711 GIT_SILENT made messages (after extraction) 2017-05-21 05:10:30 +02:00
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"
2017-05-21 04:36:10 +02:00
l10n daemon script 58d23a20ae GIT_SILENT made messages (after extraction) 2017-05-12 04:56:11 +02:00
l10n daemon script ef9ea64bc3 GIT_SILENT made messages (after extraction) 2017-05-12 02:59:10 +02:00
Friedrich W. H. Kossebau 2779bb6c0c Don't repeat work of KAboutData::setApplicationData(), set window icon 2017-05-08 15:17:48 +02:00
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"
2017-04-22 05:08:45 +02:00
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"
2017-04-22 04:06:38 +02:00
l10n daemon script a25642c178 GIT_SILENT made messages (after extraction) 2017-04-22 02:52:16 +02:00
Oliver Sander 3859fba07d Remove dependency on KActivities on Windows.
REVIEW: 130022
REVIEW: 126378
2017-03-18 01:58:47 +01:00
Albert Astals Cid 191a37fb52 Q_DECL_OVERRIDE -> override 2017-03-02 20:39:24 +01:00
l10n daemon script 5c929b2585 GIT_SILENT made messages (after extraction) 2017-02-28 09:33:35 +01:00
l10n daemon script 2a0bdca687 GIT_SILENT made messages (after extraction) 2017-02-07 08:56:11 +01:00
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"
2017-02-06 06:04:23 +01:00
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"
2017-02-04 06:23:35 +01:00
l10n daemon script 0922f2f524 GIT_SILENT made messages (after extraction) 2017-02-04 03:59:15 +01:00
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"
2017-02-02 05:57:03 +01:00
Albert Astals Cid ed4a9f42f4 Merge remote-tracking branch 'origin/Applications/16.12' 2017-01-16 00:37:25 +01:00
Albert Astals Cid f467807506 Remove #ifdefs for Qt we require in cmake anyway 2017-01-16 00:36:08 +01:00
Albert Astals Cid b13fc1d3be Readd test for file existance when opening files with # on the path
BUGS: 373855
2017-01-16 00:33:25 +01:00
l10n daemon script 93b824de9e GIT_SILENT made messages (after extraction) 2017-01-09 03:54:16 +01:00
l10n daemon script 4290dffb1b GIT_SILENT made messages (after extraction) 2016-12-26 06:45:49 +01:00
l10n daemon script 30993aa3f1 GIT_SILENT made messages (after extraction) 2016-12-26 03:41:57 +01:00
l10n daemon script 73f7cd627b GIT_SILENT made messages (after extraction) 2016-12-23 03:49:23 +01:00
Albert Astals Cid 195c99e090 Merge remote-tracking branch 'origin/Applications/16.12' 2016-12-22 23:12:23 +01:00
l10n daemon script 2e1a71ffe3 GIT_SILENT made messages (after extraction) 2016-12-21 06:52:53 +01:00
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"
2016-12-20 13:06:28 +01:00
l10n daemon script 006cb782a2 GIT_SILENT made messages (after extraction) 2016-12-20 09:19:46 +01:00
l10n daemon script 20f6524016 GIT_SILENT made messages (after extraction) 2016-12-13 02:45:16 +01:00
l10n daemon script 6bc9feaba4 GIT_SILENT made messages (after extraction) 2016-12-12 04:38:06 +01:00
l10n daemon script e798a92c06 GIT_SILENT made messages (after extraction) 2016-12-12 02:39:28 +01:00
l10n daemon script 8c2120e2d3 GIT_SILENT made messages (after extraction) 2016-12-09 04:31:33 +01:00
l10n daemon script 31da71cdec GIT_SILENT made messages (after extraction) 2016-12-09 02:36:45 +01:00
l10n daemon script 56759cd0b3 SVN_SILENT made messages (after extraction) 2016-12-02 05:11:22 +01:00
l10n daemon script 4c8280e461 SVN_SILENT made messages (after extraction) 2016-12-02 03:21:51 +01:00
l10n daemon script fa74d6eea7 SVN_SILENT made messages (after extraction) 2016-12-01 02:51:26 +01:00
l10n daemon script fecf0a8de6 SVN_SILENT made messages (after extraction) 2016-11-29 05:04:44 +01:00
l10n daemon script 96fd8111c1 SVN_SILENT made messages (after extraction) 2016-11-29 03:09:19 +01:00
l10n daemon script 43cde01ced SVN_SILENT made messages (after extraction) 2016-11-28 04:44:19 +01:00
l10n daemon script f505e51b32 SVN_SILENT made messages (after extraction) 2016-11-28 02:53:18 +01:00
l10n daemon script 6aaf19e884 SVN_SILENT made messages (after extraction) 2016-11-23 04:59:06 +01:00
l10n daemon script d075df4eb0 SVN_SILENT made messages (after extraction) 2016-11-23 02:56:17 +01:00
l10n daemon script 5a4b3f4aa9 SVN_SILENT made messages (after extraction) 2016-11-19 22:48:41 +01:00
l10n daemon script 1c3e55c4f2 SVN_SILENT made messages (after extraction) 2016-11-19 20:15:50 +01:00
l10n daemon script 92efe12446 SVN_SILENT made messages (after extraction) 2016-11-08 07:35:23 +00:00