marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 17:54:45 +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-03 02:40:44 +00:00
parent 7d10cb337d
commit 1588a45026
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
quicksettings/hotspot/metadata.json
View file

@ -4,15 +4,18 @@
{ {
"Email": "skilvingr@gmail.com", "Email": "skilvingr@gmail.com",
"Name": "Yari Polla", "Name": "Yari Polla",
"Name[uk]": "Yari Polla",
"Name[x-test]": "xxYari Pollaxx" "Name[x-test]": "xxYari Pollaxx"
} }
], ],
"Description": "Hotspot quick setting for Plasma Mobile", "Description": "Hotspot quick setting for Plasma Mobile",
"Description[uk]": "Швидке налаштовування точки доступу для Мобільної Плазми",
"Description[x-test]": "xxHotspot quick setting for Plasma Mobilexx", "Description[x-test]": "xxHotspot quick setting for Plasma Mobilexx",
"Icon": "network-wireless-hotspot", "Icon": "network-wireless-hotspot",
"Id": "org.kde.plasma.quicksetting.hotspot", "Id": "org.kde.plasma.quicksetting.hotspot",
"License": "GPL-2.0+", "License": "GPL-2.0+",
"Name": "Hotspot", "Name": "Hotspot",
"Name[uk]": "Точка доступу",
"Name[x-test]": "xxHotspotxx", "Name[x-test]": "xxHotspotxx",
"ServiceTypes": [ "ServiceTypes": [
"KPackage/GenericQML" "KPackage/GenericQML"