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 2023-03-02 03:27:43 +00:00
parent 080e2635b2
commit 0564472de4
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/hotspot/metadata.json
View file

@ -3,14 +3,17 @@
"Authors": [
{
"Email": "skilvingr@gmail.com",
"Name": "Yari Polla"
"Name": "Yari Polla",
"Name[x-test]": "xxYari Pollaxx"
}
],
"Description": "Hotspot quick setting for Plasma Mobile",
"Description[x-test]": "xxHotspot quick setting for Plasma Mobilexx",
"Icon": "network-wireless-hotspot",
"Id": "org.kde.plasma.quicksetting.hotspot",
"License": "GPL-2.0+",
"Name": "Hotspot",
"Name[x-test]": "xxHotspotxx",
"ServiceTypes": [
"KPackage/GenericQML"
],