Jonathan Riddell ha scritto: > On Thu, Apr 20, 2017 at 12:18:53AM +0200, Luigi Toscano wrote: >> == Plasma >> Renaming in: master (before the branching of 5.10) >> >> - duplicate in: workspace/plasma-desktop >> kcm_baloofile.po -> kcm_baloofile5.po >> >> - duplicate in: workspace/plasma-workspace >> plasma_runner_baloosearchrunner.po -> plasma_runner_baloosearch.po >> >> - kcm_activities.po is marked as duplicate, but is it still an issue? >> workspace has kcm_activities5 since "Mon May 23 15:33:17 2016 +0100" >> by Jonathan Riddell (Plasma >= 5.7) > > as discussed, kcm_activities.po isn't a conflict we ship only kcm_activities5 > in plasma. Go ahead with other two. >
Thanks, in the meantime Andreas sent me the list of the conflicting files with kde-runtime (the previous one was only for kdelibs). It means also the following files from Plasma: attica_kde.po drkonqi.po filetypes.po kcmcomponentchooser.po kcm_device_automounter.po kcm_emoticons.po kcmicons.po kcmkded.po kcmnotify.po kcm_phonon.po kcmshell.po kdesu.po kio_applications.po kioclient.po kmimetypefinder.po knetattach.po kstart.po ktraderclient.po phonon_kde.po soliduiserver.po Also, for Applications: kio_archive.po kio_bookmarks.po kio_fish.po kio_info.po kio_man.po kio_nfs.po kio_recentdocuments.po kio_sftp.po kio_smb.po kio_thumbnail.po (probably all kio-extras) I just renamed khelpcenter. and Frameworks: kglobalaccel.po Ciao -- Luigi
