lp:~neon/project-neon/plasma-mediacenter
- Get this branch:
- bzr branch lp:~neon/project-neon/plasma-mediacenter
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at https://invent.kde.org/unmaintained/plasma-mediacenter.
Last successful import was .
Recent revisions
- 2020. By l10n daemon script <email address hidden>
-
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. By l10n daemon script <email address hidden>
-
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. By l10n daemon script <email address hidden>
-
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. By l10n daemon script <email address hidden>
-
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. By Alexander Potashev
-
i18n: Add context to "Search Playlist"
Test Plan: none
Reviewers: bshah
Reviewed By: bshah
Subscribers: bshah
Differential Revision: https:/
/phabricator. kde.org/ D19294 - 2014. By l10n daemon script <email address hidden>
-
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"
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)