l10n daemon script
bba40b9b9d
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-05 06:07:10 +01:00
l10n daemon script
68f1a87c67
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-01-28 06:33:42 +01:00
Aleix Pol
c07851470a
Remove unavailable ServiceTypes
...
Reviewers: #plasma, mart
Reviewed By: mart
Subscribers: plasma-devel, #frameworks
Tags: #plasma, #frameworks
Differential Revision: https://phabricator.kde.org/D4169
2017-01-17 14:57:46 +01:00
Bhushan Shah
780be6f4ce
Fix the renderType properties for various components
...
To use isMobile one need to import the QtQuickControls as well in
addition to QtQuickControls.Private
This fixes the warning flood at runtime
CCMAIL: faure@kde.org
I think p-f 5.30.0 tars need to be re-done with this.
2017-01-09 14:50:06 +05:30
Bhushan Shah
324232a745
[declarativeimports] Use QtRendering on phone devices
...
Summary: Ref T4947
Test Plan: works on desktop at least, haven't tested on phone yet
Reviewers: #plasma, mart
Reviewed By: mart
Subscribers: plasma-devel
Tags: #plasma
Maniphest Tasks: T4947
Differential Revision: https://phabricator.kde.org/D3789
2016-12-23 16:37:16 +05:30
l10n daemon script
2f4e59e902
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-22 05:52:51 +01:00
l10n daemon script
793441b77b
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 12:53:44 +01:00
l10n daemon script
3962e29b61
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-11-30 04:25:52 +01:00
l10n daemon script
3b33c0a566
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-10-04 10:22:57 +00:00
l10n daemon script
84f2e93be9
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-09-30 09:38:09 +00:00
l10n daemon script
71b8f9b22d
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-09-09 09:25:38 +00:00
l10n daemon script
13dc03991d
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-02-06 09:49:14 +00:00
l10n daemon script
087c10cd43
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-02-05 09:18:18 +00:00
l10n daemon script
3dac19023c
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-02-02 10:51:53 +00:00
l10n daemon script
bd10d78e1e
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-01-22 09:52:02 +00:00
l10n daemon script
4519c25d5c
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"
2015-11-10 12:46:43 +00:00
l10n daemon script
01f4cf59ea
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"
2015-11-04 17:07:45 +00:00
l10n daemon script
b4a42d3616
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"
2015-10-26 10:07:41 +00:00
andreas kainz
6c20f17af9
Breeze Icon: add widget icon to notes
2015-10-12 11:41:42 +02:00
l10n daemon script
98583160cb
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"
2015-08-28 10:20:30 +00:00
l10n daemon script
c718ba4b48
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"
2015-08-26 10:19:25 +00:00
l10n daemon script
a5ff979996
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"
2015-08-10 10:12:53 +00:00
l10n daemon script
a989a77a0d
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"
2015-06-03 10:14:00 +00:00
l10n daemon script
9ea35bd26d
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"
2015-05-27 10:14:57 +00:00
l10n daemon script
81ec3e0d58
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"
2015-05-16 11:30:30 +00:00
l10n daemon script
a48529b3c8
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"
2015-05-01 10:21:06 +00:00
l10n daemon script
4207218d8b
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"
2015-04-26 09:45:20 +00:00
l10n daemon script
7897780310
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"
2015-04-18 10:26:53 +00:00
l10n daemon script
505c1f8cba
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"
2015-04-07 13:16:44 +00:00
l10n daemon script
b7e5392a7b
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"
2015-03-19 09:50:52 +00:00
l10n daemon script
104f37b8c8
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"
2015-03-16 10:11:21 +00:00
l10n daemon script
5265842028
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"
2015-03-14 10:19:38 +00:00
l10n daemon script
e44eb9edec
SVN_SILENT made messages (.desktop file)
2015-02-27 11:41:25 +00:00
l10n daemon script
073b83b440
SVN_SILENT made messages (.desktop file)
2015-02-16 10:17:17 +00:00
l10n daemon script
03bae89ac5
SVN_SILENT made messages (.desktop file)
2015-02-04 08:58:49 +00:00
l10n daemon script
8fb6f677dd
SVN_SILENT made messages (.desktop file)
2015-01-29 09:16:20 +00:00
l10n daemon script
4b1970cf83
SVN_SILENT made messages (.desktop file)
2015-01-27 11:23:41 +00:00
l10n daemon script
fb4932bf3c
SVN_SILENT made messages (.desktop file)
2015-01-26 09:01:51 +00:00
l10n daemon script
b46bd92d0d
SVN_SILENT made messages (.desktop file)
2015-01-21 08:54:32 +00:00
l10n daemon script
65f867b152
SVN_SILENT made messages (.desktop file)
2015-01-19 08:58:56 +00:00
l10n daemon script
d255c63ce2
SVN_SILENT made messages (.desktop file)
2015-01-13 11:36:35 +00:00
l10n daemon script
41777ed685
SVN_SILENT made messages (.desktop file)
2015-01-06 10:55:19 +00:00
l10n daemon script
050c7707bf
SVN_SILENT made messages (.desktop file)
2015-01-03 09:14:08 +00:00
l10n daemon script
1afbc2c461
SVN_SILENT made messages (.desktop file)
2015-01-02 09:15:04 +00:00
l10n daemon script
6f7a3ae9ea
SVN_SILENT made messages (.desktop file)
2014-12-30 10:48:32 +00:00
l10n daemon script
53d694072c
SVN_SILENT made messages (.desktop file)
2014-12-19 09:15:56 +00:00
l10n daemon script
f64207f408
SVN_SILENT made messages (.desktop file)
2014-12-14 08:54:42 +00:00
l10n daemon script
d47e417e40
SVN_SILENT made messages (.desktop file)
2014-12-07 08:47:50 +00:00
l10n daemon script
cf3898f7a9
SVN_SILENT made messages (.desktop file)
2014-12-01 08:51:21 +00:00
l10n daemon script
7d8ebae3f7
SVN_SILENT made messages (.desktop file)
2014-11-30 08:55:13 +00:00