marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 2025-08-20 01:36:17 +00:00
parent 2ba1eeb8d4
commit d2e03281dc
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
quicksettings/kscreenosd/package/metadata.json
View file

@ -4,14 +4,17 @@
"Authors": [ "Authors": [
{ {
"Email": "sebas@kde.org", "Email": "sebas@kde.org",
"Name": "Sebastian Kügler" "Name": "Sebastian Kügler",
"Name[x-test]": "xxSebastian Küglerxx"
} }
], ],
"Description": "Screen setup OSD quick setting for Plasma Mobile", "Description": "Screen setup OSD quick setting for Plasma Mobile",
"Description[x-test]": "xxScreen setup OSD quick setting for Plasma Mobilexx",
"Icon": "osd-duplicate", "Icon": "osd-duplicate",
"Id": "org.kde.plasma.quicksetting.kscreenosd", "Id": "org.kde.plasma.quicksetting.kscreenosd",
"License": "GPL-2.0+", "License": "GPL-2.0+",
"Name": "Screen OSD", "Name": "Screen OSD",
"Name[x-test]": "xxScreen OSDxx",
"Website": "https://kde.org" "Website": "https://kde.org"
} }
} }