marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-07-26 06:14: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-06-18 03:45:48 +00:00
parent 480218c405
commit ead62a26cc
5 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
initialstart/modules/wifi/package/metadata.json
View file

@ -82,6 +82,7 @@
"Name[tr]": "Wi-Fi", "Name[tr]": "Wi-Fi",
"Name[uk]": "WiFi", "Name[uk]": "WiFi",
"Name[x-test]": "xxWiFixx", "Name[x-test]": "xxWiFixx",
"Name[zh_CN]": "WiFi",
"ServiceTypes": [ "ServiceTypes": [
"KPackage/GenericQML" "KPackage/GenericQML"
], ],

3
kcms/hotspot/kcm_mobile_hotspot.json
View file

@ -23,7 +23,8 @@
"Name[sl]": "Tobias Fella", "Name[sl]": "Tobias Fella",
"Name[tr]": "Tobias Fella", "Name[tr]": "Tobias Fella",
"Name[uk]": "Tobias Fella", "Name[uk]": "Tobias Fella",
"Name[x-test]": "xxTobias Fellaxx" "Name[x-test]": "xxTobias Fellaxx",
"Name[zh_CN]": "Tobias Fella"
} }
], ],
"Category": "System Information", "Category": "System Information",

3
kwin/scripts/convergentwindows/metadata.json
View file

@ -24,7 +24,8 @@
"Name[sl]": "Plata Hill", "Name[sl]": "Plata Hill",
"Name[tr]": "Plata Hill", "Name[tr]": "Plata Hill",
"Name[uk]": "Plata Hill", "Name[uk]": "Plata Hill",
"Name[x-test]": "xxPlata Hillxx" "Name[x-test]": "xxPlata Hillxx",
"Name[zh_CN]": "Plata Hill"
} }
], ],
"Description": "Removes window decorations and maximizes windows on the first screen only.", "Description": "Removes window decorations and maximizes windows on the first screen only.",

2
lookandfeel/metadata.json
View file

@ -52,6 +52,7 @@
"Description[tr]": "Taşınabilir aygıtlar için Plasma", "Description[tr]": "Taşınabilir aygıtlar için Plasma",
"Description[uk]": "Плазма для мобільних пристроїв", "Description[uk]": "Плазма для мобільних пристроїв",
"Description[x-test]": "xxPlasma for mobile devicesxx", "Description[x-test]": "xxPlasma for mobile devicesxx",
"Description[zh_CN]": "针对手机设备设计的 Plasma 环境",
"Id": "org.kde.breeze.mobile", "Id": "org.kde.breeze.mobile",
"License": "GPLv2+", "License": "GPLv2+",
"Name": "Plasma Mobile Breeze", "Name": "Plasma Mobile Breeze",
@ -75,6 +76,7 @@
"Name[tr]": "Plasma Cep Esinti", "Name[tr]": "Plasma Cep Esinti",
"Name[uk]": "Breeze для мобільної Плазми", "Name[uk]": "Breeze для мобільної Плазми",
"Name[x-test]": "xxPlasma Mobile Breezexx", "Name[x-test]": "xxPlasma Mobile Breezexx",
"Name[zh_CN]": "Plasma Mobile Breeze 微风",
"Version": "2.0", "Version": "2.0",
"Website": "https://www.kde.org" "Website": "https://www.kde.org"
}, },

3
quicksettings/hotspot/metadata.json
View file

@ -23,7 +23,8 @@
"Name[sl]": "Yari Polla", "Name[sl]": "Yari Polla",
"Name[tr]": "Yari Polla", "Name[tr]": "Yari Polla",
"Name[uk]": "Yari Polla", "Name[uk]": "Yari Polla",
"Name[x-test]": "xxYari Pollaxx" "Name[x-test]": "xxYari Pollaxx",
"Name[zh_CN]": "Yari Polla"
} }
], ],
"Description": "Hotspot quick setting for Plasma Mobile", "Description": "Hotspot quick setting for Plasma Mobile",