marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03: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 2022-09-01 01:41:48 +00:00
parent c87b078e15
commit 0a0761bf8a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quicksettings/record/metadata.json
View file

@ -28,11 +28,11 @@
"Name[zh_CN]": "Aleix Pol i Gonzalez" "Name[zh_CN]": "Aleix Pol i Gonzalez"
} }
], ],
"Description": "Screen recording quick setting",
"Icon": "media-record", "Icon": "media-record",
"Id": "org.kde.plasma.quicksetting.record", "Id": "org.kde.plasma.quicksetting.record",
"License": "GPL-2.0+", "License": "GPL-2.0+",
"Name": "Record Screen", "Name": "Record Screen",
"Description": "Screen recording quick setting",
"ServiceTypes": [ "ServiceTypes": [
"KPackage/GenericQML" "KPackage/GenericQML"
], ],