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 2022-07-31 01:50:10 +00:00
parent 4ae02a3b9c
commit 93ee6189b0
22 changed files with 70 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
containments/homescreens/default/package/metadata.json
View file

@ -10,6 +10,7 @@
"Name[de]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[nl]": "Marco Martin",
@ -17,7 +18,8 @@
"Name[sl]": "Marco Martin",
"Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"
"Name[x-test]": "xxMarco Martinxx",
"Name[zh_CN]": "Marco Martin"
}
],
"Category": "Containments",

4
containments/homescreens/halcyon/package/metadata.json
View file

@ -29,6 +29,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -36,7 +37,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Category": "Containments",

4
containments/panel/package/metadata.json
View file

@ -10,6 +10,7 @@
"Name[de]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[nl]": "Marco Martin",
@ -17,7 +18,8 @@
"Name[sl]": "Marco Martin",
"Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"
"Name[x-test]": "xxMarco Martinxx",
"Name[zh_CN]": "Marco Martin"
}
],
"Category": "Containments",

4
containments/taskpanel/package/metadata.json
View file

@ -10,6 +10,7 @@
"Name[de]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[nl]": "Marco Martin",
@ -17,7 +18,8 @@
"Name[sl]": "Marco Martin",
"Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"
"Name[x-test]": "xxMarco Martinxx",
"Name[zh_CN]": "Marco Martin"
}
],
"Category": "Containments",

6
kcms/mobileshell/kcm_mobileshell.json
View file

@ -10,6 +10,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -17,7 +18,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Category": "System Information",
@ -27,6 +29,7 @@
"Description[ca]": "Configura l'intèrpret d'ordres del sistema",
"Description[en_GB]": "Configure the system shell",
"Description[es]": "Configurar el intérprete de órdenes del sistema",
"Description[eu]": "Konfiguratu sistemaren oskola",
"Description[fr]": "Configurer le shell du système",
"Description[it]": "Configura la shell di sistema",
"Description[nl]": "De systeem-shell configureren",
@ -35,6 +38,7 @@
"Description[tr]": "Sistem kabuğunu yapılandır",
"Description[uk]": "Налаштувати командну оболонку системи",
"Description[x-test]": "xxConfigure the system shellxx",
"Description[zh_CN]": "配置系统外壳程序",
"EnabledByDefault": true,
"FormFactors": [
"desktop",

4
quicksettings/airplanemode/metadata.json
View file

@ -34,6 +34,7 @@
"Name[de]": "Bhushan Shah",
"Name[en_GB]": "Bhushan Shah",
"Name[es]": "Bhushan Shah",
"Name[eu]": "Bhushan Shah",
"Name[fr]": "Bhushan Shah",
"Name[it]": "Bhushan Shah",
"Name[nl]": "Bhushan Shah",
@ -41,7 +42,8 @@
"Name[sl]": "Bhushan Shah",
"Name[tr]": "Buşan Şah",
"Name[uk]": "Bhushan Shah",
"Name[x-test]": "xxBhushan Shahxx"
"Name[x-test]": "xxBhushan Shahxx",
"Name[zh_CN]": "Bhushan Shah"
}
],
"Icon": "network-flightmode-on",

4
quicksettings/audio/metadata.json
View file

@ -34,6 +34,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -41,7 +42,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "audio-speakers-symbolic",

4
quicksettings/battery/metadata.json
View file

@ -34,6 +34,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -41,7 +42,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "battery-full",

4
quicksettings/bluetooth/metadata.json
View file

@ -35,6 +35,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -42,7 +43,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "network-bluetooth",

4
quicksettings/caffeine/metadata.json
View file

@ -10,6 +10,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -17,7 +18,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "system-suspend-hibernate",

4
quicksettings/flashlight/package/metadata.json
View file

@ -34,6 +34,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -41,7 +42,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "flashlight-on",

4
quicksettings/keyboardtoggle/metadata.json
View file

@ -10,6 +10,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -17,7 +18,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "input-keyboard-virtual",

4
quicksettings/location/metadata.json
View file

@ -34,6 +34,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -41,7 +42,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "gps",

4
quicksettings/mobiledata/metadata.json
View file

@ -34,6 +34,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -41,7 +42,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "network-modem",

4
quicksettings/nightcolor/package/metadata.json
View file

@ -10,6 +10,7 @@
"Name[de]": "Aleix Pol",
"Name[en_GB]": "Aleix Pol",
"Name[es]": "Aleix Pol",
"Name[eu]": "Aleix Pol",
"Name[fr]": "Aleix Pol",
"Name[it]": "Aleix Pol",
"Name[nl]": "Aleix Pol",
@ -17,7 +18,8 @@
"Name[sl]": "Aleix Pol",
"Name[tr]": "Aleix Pol",
"Name[uk]": "Aleix Pol",
"Name[x-test]": "xxAleix Polxx"
"Name[x-test]": "xxAleix Polxx",
"Name[zh_CN]": "Aleix Pol"
}
],
"Icon": "redshift-status-on",

4
quicksettings/powermenu/package/metadata.json
View file

@ -10,6 +10,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -17,7 +18,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "system-shutdown-symbolic",

4
quicksettings/record/metadata.json
View file

@ -10,6 +10,7 @@
"Name[de]": "Aleix Pol i Gonzalez",
"Name[en_GB]": "Aleix Pol i Gonzalez",
"Name[es]": "Aleix Pol i Gonzalez",
"Name[eu]": "Aleix Pol i Gonzalez",
"Name[fr]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez",
@ -17,7 +18,8 @@
"Name[sl]": "Aleix Pol i Gonzalez",
"Name[tr]": "Aleix Pol i Gonzalez",
"Name[uk]": "Aleix Pol i Gonzalez",
"Name[x-test]": "xxAleix Pol i Gonzalezxx"
"Name[x-test]": "xxAleix Pol i Gonzalezxx",
"Name[zh_CN]": "Aleix Pol i Gonzalez"
}
],
"Icon": "spectacle",

4
quicksettings/screenrotation/package/metadata.json
View file

@ -34,6 +34,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -41,7 +42,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "rotation-allowed",

4
quicksettings/screenshot/package/metadata.json
View file

@ -34,6 +34,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -41,7 +42,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "spectacle",

4
quicksettings/settingsapp/metadata.json
View file

@ -35,6 +35,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -42,7 +43,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "spectacle",

4
quicksettings/wifi/metadata.json
View file

@ -36,6 +36,7 @@
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -43,7 +44,8 @@
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin"
}
],
"Icon": "network-wireless-signal",

6
shell/metadata.json
View file

@ -10,6 +10,7 @@
"Name[de]": "Aaron Seigo",
"Name[en_GB]": "Aaron Seigo",
"Name[es]": "Aaron Seigo",
"Name[eu]": "Aaron Seigo",
"Name[fr]": "Aaron Seigo",
"Name[it]": "Aaron Seigo",
"Name[nl]": "Aaron Seigo",
@ -17,7 +18,8 @@
"Name[sl]": "Aaron Seigo",
"Name[tr]": "Aaron Seigo",
"Name[uk]": "Aaron Seigo",
"Name[x-test]": "xxAaron Seigoxx"
"Name[x-test]": "xxAaron Seigoxx",
"Name[zh_CN]": "Aaron Seigo"
}
],
"Category": "",
@ -28,6 +30,7 @@
"Description[de]": "Plasma-Shell für Telefone",
"Description[en_GB]": "Plasma shell for phones",
"Description[es]": "Intérprete de órdenes de Plasma para teléfonos",
"Description[eu]": "Telefonoetarako Plasma oskola",
"Description[fr]": "Shell Plasma pour téléphones",
"Description[it]": "Shell di Plasma per telefoni",
"Description[nl]": "Plasma-shell voor telefoons",
@ -36,6 +39,7 @@
"Description[tr]": "Telefonlar için Plasma kabuğu",
"Description[uk]": "Оболонка Плазми для телефонів",
"Description[x-test]": "xxPlasma shell for phonesxx",
"Description[zh_CN]": "适配手机的 Plasma 外壳程序",
"Id": "org.kde.plasma.phoneshell",
"License": "GPLv2+",
"Name": "Phone",