alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,100 Commits 1 Branch 0 Tags 40 MiB
fa8b766eb0
Commit Graph

29 Commits

Author SHA1 Message Date
l10n daemon script
3d5a10783e 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"
 2019-01-29 05:32:51 +01:00
Friedrich W. H. Kossebau
f423f65bfd [Wallpaper templates] Add missing Comment= entry to desktop file 2019-01-19 16:10:35 +01:00
Friedrich W. H. Kossebau
1eb3b7ccaa Remove explicit use of ECM_KDE_MODULE_DIR, part of ECM_MODULE_PATH 
GIT_SILENT
 2019-01-19 16:09:29 +01:00
l10n daemon script
a535d49e09 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"
 2018-12-03 05:31:39 +01:00
l10n daemon script
a600ff9aa0 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"
 2018-10-15 05:39:14 +02:00
l10n daemon script
4b7bac26cc 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"
 2018-10-10 06:27:59 +02:00
l10n daemon script
a73ac63ace 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"
 2018-09-15 05:56:48 +02:00
l10n daemon script
ba618b6946 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"
 2018-08-15 05:45:23 +02:00
l10n daemon script
6d1a59608e 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"
 2018-08-05 05:30:30 +02:00
l10n daemon script
25536d86aa 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"
 2018-07-13 05:23:39 +02:00
l10n daemon script
dc3aaddeeb 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"
 2018-06-07 05:42:59 +02:00
l10n daemon script
d7fa21a083 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"
 2018-06-03 05:23:03 +02:00
l10n daemon script
674b9ecf20 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"
 2018-05-24 05:30:14 +02:00
Friedrich W. H. Kossebau
98e64e01a6 Templates: consistent naming, fix translation catalog names & more 
Summary:
* remove unneeded cmake includes
* consistently use org.kde.plasma.* prefix for names
* fix catalog names to match applet identifier
* bump min cmake version to 3.0
* remove duplicated X-KDE-PluginInfo-Name entries
* remove no longer (Plasma >=5.8) needed i18nd in wallpaper code
* prepare qml extension for ki18n usage

Reviewers: mart

Reviewed By: mart

Subscribers: kde-frameworks-devel, apol

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D10848
 2018-05-21 14:08:04 +02:00
l10n daemon script
330ce3207f 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"
 2018-05-20 05:26:55 +02:00
l10n daemon script
e704a9d9c9 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"
 2018-05-01 05:45:08 +02:00
l10n daemon script
eda7a3d969 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"
 2018-04-29 05:22:48 +02:00
l10n daemon script
1644a4ac6c 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"
 2018-04-27 05:29:06 +02:00
l10n daemon script
74adf38d6f 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"
 2018-04-23 05:27:56 +02:00
l10n daemon script
be129c9912 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"
 2018-04-19 05:18:00 +02:00
l10n daemon script
b1348627a0 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"
 2018-04-18 05:41:10 +02:00
l10n daemon script
26d9c50a4b 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"
 2018-04-10 05:34:06 +02:00
l10n daemon script
a89c13f4d7 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"
 2018-04-09 05:18:48 +02:00
l10n daemon script
7367905ecd 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"
 2018-04-08 05:30:00 +02:00
l10n daemon script
95512fc2ed 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"
 2018-04-06 05:24:44 +02:00
l10n daemon script
0b0b8fbb47 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"
 2018-04-05 05:28:20 +02:00
Friedrich W. H. Kossebau
682dd4a142 Wallpaper templates: set background color to ensure contrast to sample text content 
Summary:
To avoid black text on black background and thus confusion if things are
working after the initial generation from the template and first test build
and installation, also set an background with themed color.

Reviewers: #plasma, mart

Reviewed By: #plasma, mart

Subscribers: #frameworks

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D11922
 2018-04-04 14:39:18 +02:00
l10n daemon script
af47edce54 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"
 2018-04-04 05:20:09 +02:00
Friedrich W. H. Kossebau
354bd71296 Add template for Plasma wallpaper with QML extension 
Summary:
Allows to quickly start a new wallpaper which also wants to use a custom QML
extension.

Reviewers: mart

Reviewed By: mart

Subscribers: #frameworks

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D10849
 2018-04-03 16:38:14 +02:00