~neon/project-neon/kscreen : changes

~neon/project-neon/kscreen » Changes from revision 649

From Revision 597 to 578

Rev	Summary	Authors	Date
597	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script	4 years ago
596	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script	4 years ago
595	Merge branch 'Plasma/5.17' Merge branch 'Plasma/5.17'	Björn Feber	4 years ago
594	Merge remote-tracking branch 'origin/Plasma/5.17' Merge remote-tracking branch 'origin/Plasma/5.17'	Luigi Toscano	4 years ago
593	Update version number for 5.17.80 Update version number for 5.17.80 GIT_SILENT	Jonathan Riddell	4 years ago
592	Revert "Revert "i18n fixes"" Revert "Revert "i18n fixes"" Summary: As translator, any supposed arbitrary coding style which breaks the translation is not acceptable. We can certainly discuss the proper long term solution about fixing the coding style, about fixing QML, about fixing gettext, or any other fix, but knowingly breaking the translations is not acceptable. We can certainly discuss after. This reverts commit b5fc1a7619ad851c50a7969ab029c2592727b068. Test Plan: Transltions works. Reviewers: #plasma, romangg Reviewed By: #plasma, romangg Subscribers: bshah, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D24073	Luigi Toscano	4 years ago
591	Revert "i18n fixes" Revert "i18n fixes" This reverts commit 6ae066c02573450e644d9abe532ceda8475d34cb. The change breaks the 100 chars limit on source code set as part of the Frameworks Coding Style. If there is currently no other possibility to facilitate translations of long text lines in QML without breaking this limit a temporary exception can be made, but this needs to be discussed first and a plan must be drafted on how to solve this conflict in the future. To start such a discussion about short and long-term solution please create a review on Phabricator for this change. CCMAIL: pino@kde.org	Roman Gilg	4 years ago
590	Update version number for 5.16.90 Update version number for 5.16.90 GIT_SILENT	Jonathan Riddell	4 years ago
589	update to latest kf5 dependency update to latest kf5 dependency	Jonathan Riddell	4 years ago
588	i18n fixes i18n fixes - avoid string concatenation in i18n literals, as they are not valid strings to extract - style fixes	Pino Toscano	4 years ago
587	Improve output enablement recovery and config write Improve output enablement recovery and config write Summary: Remember or calculate position and mode size after an output has been enabled again. Additionally on disable do write back the last working output config to the config file but not to the global one. Test Plan: Tested on Wayland and X11. Reviewers: #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D24038	Roman Gilg	4 years ago
586	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script	4 years ago
585	Delay load on output add/remove Delay load on output add/remove Summary: In order to give the KScreen daemon time to update the config settings after an output has been removed or added delay the load call by one second. Test Plan: Tested on Wayland and X. Reviewers: #plasma, ngraham Reviewed By: ngraham Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D24021	Roman Gilg	4 years ago
584	Polish Displays KCM UI Polish Displays KCM UI Summary: This patch improves and polishes the new KScreen KCM's UI in a variety of ways. A picture says a thousand words, so look at the pictures. :) BUG: 348126 FIXED-IN: 5.17.0 Test Plan: Due to an unrelated bug, my second screen isn't showing up in the visualization, so please excuse the fact that only one appears there in these screenshots: {F7369458} {F7369494} All functionality that was working before is still working now. Reviewers: romangg, #vdg, #kwin, GB_2 Reviewed By: romangg, #vdg, #kwin, GB_2 Subscribers: filipf, ndavis, GB_2, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D23798	Nate Graham	4 years ago
583	Revert "We depend against 5.58" oops we need > 5.58 Revert "We depend against 5.58" oops we need > 5.58 This reverts commit c9bf10df3f942e52f1efbeddaf08a9f136849732.	Laurent Montel	4 years ago
582	We depend against 5.58 We depend against 5.58	Laurent Montel	4 years ago
581	Partially revert "[kcm] Fix i18n output file name and split ... Partially revert "[kcm] Fix i18n output file name and split texts" Splitting strings for sake of fitting to 100 characters style is not an appropriate i18n solution. This partially reverts commit a798e78d477eac185918b63ce8a196fa537df31d.	Pino Toscano	4 years ago
580	GIT_SILENT: QLatin1Literal->QLatin1String GIT_SILENT: QLatin1Literal->QLatin1String	Laurent Montel	4 years ago
579	[kcm] Fix i18n output file name and split texts [kcm] Fix i18n output file name and split texts Summary: The output file name must be kcm_kscreen.po for translators to pick it up and text being split to respect the 100 chars line limit must first be translated before being merged together again. Test Plan: KCM starts without errors. Reviewers: #plasma, victorr, yurchor Reviewed By: yurchor Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D23783	Roman Gilg	4 years ago
578	Reorder the frameworks requirements Reorder the frameworks requirements GIT_SILENT	Christophe Giboudeau...	4 years ago