mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
30312c4e7a
commit
9655dcdc6d
23 changed files with 192 additions and 22 deletions
|
|
@ -8,6 +8,7 @@ Name=Plasma Mobile (Development)
|
|||
Name[az]=Plasma Mobil (Tərtibat)
|
||||
Name[ca]=Plasma Mobile (Desenvolupament)
|
||||
Name[ca@valencia]=Plasma Mobile (Desenvolupament)
|
||||
Name[en_GB]=Plasma Mobile (Development)
|
||||
Name[es]=Plasma Mobile (desarrollo)
|
||||
Name[eu]=Plasma Mugikorra (Garapena)
|
||||
Name[fi]=Plasma Mobile (kehitys)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "mart@kde.org",
|
||||
"Name": "Marco Martin"
|
||||
"Name": "Marco Martin",
|
||||
"Name[az]": "Marco Martin",
|
||||
"Name[ca]": "Marco Martin",
|
||||
"Name[en_GB]": "Marco Martin",
|
||||
"Name[pt]": "Marco Martin",
|
||||
"Name[tr]": "Marco Martin",
|
||||
"Name[uk]": "Marco Martin",
|
||||
"Name[x-test]": "xxMarco Martinxx"
|
||||
}
|
||||
],
|
||||
"Category": "Containments",
|
||||
|
|
|
|||
|
|
@ -22,7 +22,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Category": "Containments",
|
||||
|
|
@ -32,6 +39,7 @@
|
|||
"Name[az]": "Halcyon",
|
||||
"Name[ca@valencia]": "Halcyon",
|
||||
"Name[ca]": "Halcyon",
|
||||
"Name[en_GB]": "Halcyon",
|
||||
"Name[es]": "Halcyon",
|
||||
"Name[eu]": "Halcyon",
|
||||
"Name[fi]": "Halcyon",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "mart@kde.org",
|
||||
"Name": "Marco Martin"
|
||||
"Name": "Marco Martin",
|
||||
"Name[az]": "Marco Martin",
|
||||
"Name[ca]": "Marco Martin",
|
||||
"Name[en_GB]": "Marco Martin",
|
||||
"Name[pt]": "Marco Martin",
|
||||
"Name[tr]": "Marco Martin",
|
||||
"Name[uk]": "Marco Martin",
|
||||
"Name[x-test]": "xxMarco Martinxx"
|
||||
}
|
||||
],
|
||||
"Category": "Containments",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "mart@kde.org",
|
||||
"Name": "Marco Martin"
|
||||
"Name": "Marco Martin",
|
||||
"Name[az]": "Marco Martin",
|
||||
"Name[ca]": "Marco Martin",
|
||||
"Name[en_GB]": "Marco Martin",
|
||||
"Name[pt]": "Marco Martin",
|
||||
"Name[tr]": "Marco Martin",
|
||||
"Name[uk]": "Marco Martin",
|
||||
"Name[x-test]": "xxMarco Martinxx"
|
||||
}
|
||||
],
|
||||
"Category": "Containments",
|
||||
|
|
|
|||
|
|
@ -3,11 +3,25 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "espidev@gmail.com",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Category": "System Information",
|
||||
"Description": "Configure the system shell",
|
||||
"Description[az]": "Sistem üz qabığını tənzimləyin",
|
||||
"Description[ca]": "Configura l'intèrpret d'ordres del sistema",
|
||||
"Description[en_GB]": "Configure the system shell",
|
||||
"Description[pt]": "Configurar a consola do sistema",
|
||||
"Description[tr]": "Sistem kabuğunu yapılandır",
|
||||
"Description[uk]": "Налаштувати командну оболонку системи",
|
||||
"Description[x-test]": "xxConfigure the system shellxx",
|
||||
"EnabledByDefault": true,
|
||||
"FormFactors": [
|
||||
"desktop",
|
||||
|
|
|
|||
|
|
@ -27,7 +27,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "bshah@kde.org",
|
||||
"Name": "Bhushan Shah"
|
||||
"Name": "Bhushan Shah",
|
||||
"Name[az]": "Bhushan Shah",
|
||||
"Name[ca]": "Bhushan Shah",
|
||||
"Name[en_GB]": "Bhushan Shah",
|
||||
"Name[pt]": "Bhushan Shah",
|
||||
"Name[tr]": "Buşan Şah",
|
||||
"Name[uk]": "Bhushan Shah",
|
||||
"Name[x-test]": "xxBhushan Shahxx"
|
||||
}
|
||||
],
|
||||
"Icon": "network-flightmode-on",
|
||||
|
|
|
|||
|
|
@ -27,7 +27,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "audio-speakers-symbolic",
|
||||
|
|
|
|||
|
|
@ -27,7 +27,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "battery-full",
|
||||
|
|
|
|||
|
|
@ -28,7 +28,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "network-bluetooth",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "system-suspend-hibernate",
|
||||
|
|
|
|||
|
|
@ -27,7 +27,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "flashlight-on",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "input-keyboard-virtual",
|
||||
|
|
|
|||
|
|
@ -27,7 +27,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "gps",
|
||||
|
|
|
|||
|
|
@ -27,7 +27,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "network-modem",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "aleixpol@kde.org",
|
||||
"Name": "Aleix Pol"
|
||||
"Name": "Aleix Pol",
|
||||
"Name[az]": "Aleix Pol",
|
||||
"Name[ca]": "Aleix Pol",
|
||||
"Name[en_GB]": "Aleix Pol",
|
||||
"Name[pt]": "Aleix Pol",
|
||||
"Name[tr]": "Aleix Pol",
|
||||
"Name[uk]": "Aleix Pol",
|
||||
"Name[x-test]": "xxAleix Polxx"
|
||||
}
|
||||
],
|
||||
"Icon": "redshift-status-on",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "system-shutdown-symbolic",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "aleixpol@kde.org",
|
||||
"Name": "Aleix Pol i Gonzalez"
|
||||
"Name": "Aleix Pol i Gonzalez",
|
||||
"Name[az]": "Aleix Pol i Gonzalez",
|
||||
"Name[ca]": "Aleix Pol i Gonzalez",
|
||||
"Name[en_GB]": "Aleix Pol i Gonzalez",
|
||||
"Name[pt]": "Aleix Pol i Gonzalez",
|
||||
"Name[tr]": "Aleix Pol i Gonzalez",
|
||||
"Name[uk]": "Aleix Pol i Gonzalez",
|
||||
"Name[x-test]": "xxAleix Pol i Gonzalezxx"
|
||||
}
|
||||
],
|
||||
"Icon": "spectacle",
|
||||
|
|
|
|||
|
|
@ -27,7 +27,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "rotation-allowed",
|
||||
|
|
|
|||
|
|
@ -27,7 +27,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "spectacle",
|
||||
|
|
|
|||
|
|
@ -28,7 +28,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "spectacle",
|
||||
|
|
|
|||
|
|
@ -29,7 +29,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "devin@kde.org",
|
||||
"Name": "Devin Lin"
|
||||
"Name": "Devin Lin",
|
||||
"Name[az]": "Devin Lin",
|
||||
"Name[ca]": "Devin Lin",
|
||||
"Name[en_GB]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
"Name[tr]": "Devin Lin",
|
||||
"Name[uk]": "Devin Lin",
|
||||
"Name[x-test]": "xxDevin Linxx"
|
||||
}
|
||||
],
|
||||
"Icon": "network-wireless-signal",
|
||||
|
|
|
|||
|
|
@ -3,11 +3,25 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "aseigo@kde.org",
|
||||
"Name": "Aaron Seigo"
|
||||
"Name": "Aaron Seigo",
|
||||
"Name[az]": "Aaron Seigo",
|
||||
"Name[ca]": "Aaron Seigo",
|
||||
"Name[en_GB]": "Aaron Seigo",
|
||||
"Name[pt]": "Aaron Seigo",
|
||||
"Name[tr]": "Aaron Seigo",
|
||||
"Name[uk]": "Aaron Seigo",
|
||||
"Name[x-test]": "xxAaron Seigoxx"
|
||||
}
|
||||
],
|
||||
"Category": "",
|
||||
"Description": "Plasma shell for phones",
|
||||
"Description[az]": "Telefonlar üçün Plasma üz qabığı",
|
||||
"Description[ca]": "Espai de treball Plasma per a telèfons",
|
||||
"Description[en_GB]": "Plasma shell for phones",
|
||||
"Description[pt]": "Consola do Plasma para telemóveis",
|
||||
"Description[tr]": "Telefonlar için Plasma kabuğu",
|
||||
"Description[uk]": "Оболонка Плазми для телефонів",
|
||||
"Description[x-test]": "xxPlasma shell for phonesxx",
|
||||
"Id": "org.kde.plasma.phoneshell",
|
||||
"License": "GPLv2+",
|
||||
"Name": "Phone",
|
||||
|
|
|
|||
Loading…
Reference in a new issue