kwin/effects
l10n daemon script b62f687c37 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"
2020-06-25 09:00:40 +02:00
..
backgroundcontrast Port KWin to KWaylandServer 2020-04-30 12:56:08 +02:00
blur SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
colorpicker Add some const & 2019-10-30 19:23:01 +01:00
coverswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
cube SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
cubeslide SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
desktopgrid SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
dialogparent/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
diminactive SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
dimscreen/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
eyeonscreen/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-25 09:00:40 +02:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
fadingpopups/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
fallapart Revert "[effects/fallapart] Override scale, fade, and glide effect" 2019-12-12 15:31:56 +02:00
flipswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
frozenapp/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
glide SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
highlightwindow Fix compiler warnings 2020-03-17 15:07:52 +01:00
invert SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
kscreen Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
login/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
logout/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
lookingglass SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
magnifier SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
maximize/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
morphingpopups/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
mousemark SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
presentwindows SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
resize SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
scale/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
screenedge Add some const & 2019-10-30 19:23:01 +01:00
screenshot Fix compile with strict iterator 2020-05-01 13:02:39 +02:00
sessionquit/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-20 07:42:21 +02:00
sheet Update my email address 2020-01-14 18:17:18 +02:00
showfps SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
showpaint SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
slide SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
slideback Use nullptr everywhere 2019-09-19 17:48:21 +03:00
slidingpopups Port KWin to KWaylandServer 2020-04-30 12:56:08 +02:00
snaphelper [effects/snaphelper] Use windowFrameGeometryChanged 2020-02-12 10:52:26 +02:00
squash/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
startupfeedback Set cursor size default to 24 to align with KCM 2020-04-17 14:43:51 +02:00
thumbnailaside SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
touchpoints Add some const & 2019-10-30 19:23:01 +01:00
trackmouse SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
translucency/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
windowaperture/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-25 09:00:40 +02:00
windowgeometry SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
wobblywindows SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
zoom SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
CMakeLists.txt Port away from deprecated KIconLoader::IconSize 2020-02-29 00:29:13 +01:00
effect_builtins.cpp Remove the "Candy" category and fold its contents into "Appearance" 2020-02-25 11:26:27 -07:00
effect_builtins.h Use more traditional doxygen style 2019-07-29 22:06:19 +03:00
kwineffect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
logging.cpp
Messages.sh Extract messages from header file as well, optimize extraction 2020-02-16 11:55:17 +02:00
shaders.qrc