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
91b685fee3
commit
d0a8e4927d
3 changed files with 45 additions and 1 deletions
|
|
@ -4,6 +4,7 @@
|
|||
[Domain]
|
||||
Name=Waydroid Management
|
||||
Name[ca]=Gestió del Waydroid
|
||||
Name[ca@valencia]=Gestioneu Waydroid
|
||||
Name[es]=Gestión de Waydroid
|
||||
Name[he]=ניהול Waydroid
|
||||
Name[ka]=Waydroid-ის მართვა
|
||||
|
|
@ -16,6 +17,7 @@ Icon=color
|
|||
[org.kde.plasma.mobileshell.waydroidhelper.initialize]
|
||||
Name=Initialize Waydroid
|
||||
Name[ca]=Inicialitza el Waydroid
|
||||
Name[ca@valencia]=Restablix Waydroid
|
||||
Name[es]=Inicializar Waydroid
|
||||
Name[he]=אתחול Waydroid
|
||||
Name[ka]=Waydroid-ის ინიციალიზაცია
|
||||
|
|
@ -25,6 +27,7 @@ Name[uk]=Ініціалізувати Waydroid
|
|||
Name[x-test]=xxInitialize Waydroidxx
|
||||
Description=Allow initialization of Waydroid
|
||||
Description[ca]=Permet la inicialització del Waydroid
|
||||
Description[ca@valencia]=Permet la inicialització de Waydroid
|
||||
Description[es]=Permitir la inicialización de Waydroid
|
||||
Description[he]=לאפשר אתחול של Waydroid
|
||||
Description[ka]=Waydroid-ის ინიციალიზაციის დაშვება
|
||||
|
|
|
|||
|
|
@ -4,11 +4,27 @@
|
|||
{
|
||||
"Email": "florian.richer@protonmail.com",
|
||||
"Name": "Florian RICHER",
|
||||
"Name[ca]": "Florian RICHER",
|
||||
"Name[es]": "Florian RICHER",
|
||||
"Name[he]": "פלוריאן רישה",
|
||||
"Name[it]": "Florian RICHER",
|
||||
"Name[ka]": "Florian RICHER",
|
||||
"Name[nl]": "Florian RICHER",
|
||||
"Name[sl]": "Florian RICHER",
|
||||
"Name[uk]": "Florian RICHER",
|
||||
"Name[x-test]": "xxFlorian RICHERxx"
|
||||
}
|
||||
],
|
||||
"Category": "Waydroid Integration",
|
||||
"Description": "Waydroid configuration",
|
||||
"Description[ca]": "Configuració del Waydroid",
|
||||
"Description[es]": "Configuración de Waydroid",
|
||||
"Description[he]": "הגדרות Waydroid",
|
||||
"Description[it]": "Configurazione di Waydroid",
|
||||
"Description[ka]": "Waydroid-ის მორგება",
|
||||
"Description[nl]": "Waydroid-configuratie",
|
||||
"Description[sl]": "Konfiguracija Waydroid",
|
||||
"Description[uk]": "Налаштовування Waydroid",
|
||||
"Description[x-test]": "xxWaydroid configurationxx",
|
||||
"EnabledByDefault": true,
|
||||
"FormFactors": [
|
||||
|
|
@ -20,10 +36,26 @@
|
|||
"Icon": "folder-android-symbolic",
|
||||
"License": "GPL",
|
||||
"Name": "Waydroid Integration",
|
||||
"Name[ca]": "Integració del Waydroid",
|
||||
"Name[es]": "Integración con Waydroid",
|
||||
"Name[he]": "שילוב מול Waydroid",
|
||||
"Name[it]": "Integrazione Waydroid",
|
||||
"Name[ka]": "ინტეგრაცია Waydroid-თან",
|
||||
"Name[nl]": "Waydroid-integratie",
|
||||
"Name[sl]": "Integracija Waydroid",
|
||||
"Name[uk]": "Інтеграція з Waydroid",
|
||||
"Name[x-test]": "xxWaydroid Integrationxx",
|
||||
"Website": "https://plasma-mobile.org/"
|
||||
},
|
||||
"X-KDE-Keywords": "waydroid",
|
||||
"X-KDE-Keywords[ca]": "waydroid",
|
||||
"X-KDE-Keywords[es]": "waydroid",
|
||||
"X-KDE-Keywords[he]": "waydroid",
|
||||
"X-KDE-Keywords[it]": "waydroid",
|
||||
"X-KDE-Keywords[ka]": "waydroid",
|
||||
"X-KDE-Keywords[nl]": "waydroid",
|
||||
"X-KDE-Keywords[sl]": "waydroid",
|
||||
"X-KDE-Keywords[uk]": "waydroid",
|
||||
"X-KDE-Keywords[x-test]": "xxwaydroidxx",
|
||||
"X-KDE-System-Settings-Parent-Category": "system-administration"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,16 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "florian.richer@protonmail.com",
|
||||
"Name": "Florian RICHER"
|
||||
"Name": "Florian RICHER",
|
||||
"Name[ca]": "Florian RICHER",
|
||||
"Name[es]": "Florian RICHER",
|
||||
"Name[he]": "פלוריאן רישה",
|
||||
"Name[it]": "Florian RICHER",
|
||||
"Name[ka]": "Florian RICHER",
|
||||
"Name[nl]": "Florian RICHER",
|
||||
"Name[sl]": "Florian RICHER",
|
||||
"Name[uk]": "Florian RICHER",
|
||||
"Name[x-test]": "xxFlorian RICHERxx"
|
||||
}
|
||||
],
|
||||
"Description": "Waydroid quick setting for Plasma Mobile",
|
||||
|
|
|
|||
Loading…
Reference in a new issue