quine-global-labs/mirror-kde-plasma-desktop
1
0
Fork 0
mirror of https://invent.kde.org/plasma/plasma-desktop.git synced 2026-11-03 22:59:45 -09:00
Code Issues Projects Releases Packages Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2024-10-02 01:23:44 +00:00
parent 57e81432d0
commit 454fadf669
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sddm-theme/metadata.desktop
View file

@ -8,6 +8,7 @@ Name[ca]=Brisa
Name[ca@valencia]=Brisa
Name[cs]=Breeze
Name[da]=Breeze
Name[de]=Breeze
Name[el]=Breeze
Name[en_GB]=Breeze
Name[eo]=Breeze
@ -47,6 +48,7 @@ Description[ca]=Brisa
Description[ca@valencia]=Brisa
Description[cs]=Breeze
Description[da]=Breeze
Description[de]=Breeze
Description[el]=Breeze
Description[en_GB]=Breeze
Description[eo]=Brizo