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-04-02 02:23:08 +00:00
parent 5c0fd57600
commit 17a86b7882
7 changed files with 153 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
initialstart/modules/cellular/package/metadata.json
View file

@ -4,7 +4,35 @@
"Authors": [
{
"Email": "devin@kde.org",
"Name": "Devin Lin"
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[ia]": "Devin Lin",
"Name[is]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[ko]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[nn]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[ru]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Description": "Cellular initialstart module for Plasma Mobile",

30
initialstart/modules/finished/metadata.json
View file

@ -4,7 +4,35 @@
"Authors": [
{
"Email": "devin@kde.org",
"Name": "Devin Lin"
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[ia]": "Devin Lin",
"Name[is]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[ko]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[nn]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[ru]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Description": "Finished initialstart module for Plasma Mobile",

30
initialstart/modules/prepare/package/metadata.json
View file

@ -4,7 +4,35 @@
"Authors": [
{
"Email": "devin@kde.org",
"Name": "Devin Lin"
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[ia]": "Devin Lin",
"Name[is]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[ko]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[nn]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[ru]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Description": "Prepare initialstart module for Plasma Mobile",

31
initialstart/modules/time/package/metadata.json
View file

@ -4,7 +4,35 @@
"Authors": [
{
"Email": "devin@kde.org",
"Name": "Devin Lin"
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[ia]": "Devin Lin",
"Name[is]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[ko]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[nn]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[ru]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Description": "Time initialstart module for Plasma Mobile",
@ -18,4 +46,3 @@
"Website": "https://kde.org"
}
}

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

@ -4,7 +4,35 @@
"Authors": [
{
"Email": "devin@kde.org",
"Name": "Devin Lin"
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[ia]": "Devin Lin",
"Name[is]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[ko]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[nn]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[ru]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Description": "WiFi initialstart module for Plasma Mobile",
@ -18,5 +46,3 @@
"Website": "https://kde.org"
}
}

4
quicksettings/airplanemode/metadata.json
View file

@ -38,7 +38,7 @@
"Description": "Airplane mode quick setting for Plasma Mobile",
"Description[ca@valencia]": "Configuració ràpida del mode avió per a Plasma Mobile",
"Description[ca]": "Configuració ràpida del mode avió per al Plasma Mobile",
"Description[en_GB]": "Airplane mode quick setting for Plasma Mobile",
"Description[en_GB]": "Aeroplane mode quick setting for Plasma Mobile",
"Description[es]": "Ajuste rápido del modo avión para Plasma Mobile",
"Description[eu]": "Hegaldi-moduaren ezarpen azkarra Plasma Mugikorrerako",
"Description[fi]": "Lentokonetilan pika-asetus Plasma Mobileen",
@ -67,7 +67,7 @@
"Name[cs]": "Režim v Letadle",
"Name[da]": "Flytilstand",
"Name[de]": "Flugmodus",
"Name[en_GB]": "Airplane Mode",
"Name[en_GB]": "Aeroplane Mode",
"Name[es]": "Modo avión",
"Name[eu]": "Hegaldi modua",
"Name[fi]": "Lentokonetila",

6
quicksettings/docked/metadata.json
View file

@ -38,7 +38,10 @@
"Description": "Quick setting to toggle docked mode for Plasma Mobile",
"Description[ca@valencia]": "Configuració ràpida per a canviar el mode acoblat per a Plasma Mobile",
"Description[ca]": "Configuració ràpida per canviar el mode acoblat per al Plasma Mobile",
"Description[en_GB]": "Quick setting to toggle docked mode for Plasma Mobile",
"Description[es]": "Ajuste rápido para cambiar el modo acoplado para Plasma Mobile",
"Description[fr]": "Configuration rapide pour basculer ou non en mode en dock pour Plasma Mobile",
"Description[ia]": "Preferentia rapide a commutar modo de bassino (dockd) per Plasma Mobile",
"Description[nl]": "Snelle instelling om modus vastgezet om te schakelen voor Plasma Mobile",
"Description[sl]": "Hitre nastavitve za preklop v dok za Plasma Mobile",
"Description[tr]": "Plasma Mobile için rıhtımlanmış kip aç/kapat tez ayarı",
@ -50,7 +53,10 @@
"Name": "Docked Mode",
"Name[ca@valencia]": "Mode acoblat",
"Name[ca]": "Mode acoblat",
"Name[en_GB]": "Docked Mode",
"Name[es]": "Modo acoplado",
"Name[fr]": "Mode en dock",
"Name[ia]": "Modo de bassino (Docked)",
"Name[nl]": "Modus vastgezet",
"Name[sl]": "Način v doku",
"Name[tr]": "Rıhtımlanmış Kip",