mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-29 15:03: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
8b4b3e22e7
commit
a1ea58567d
2 changed files with 20 additions and 0 deletions
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
[Domain]
|
||||
Name=Waydroid Management
|
||||
Name[ar]=إدارة ويدرويد
|
||||
Name[ca]=Gestió del Waydroid
|
||||
Name[ca@valencia]=Gestioneu Waydroid
|
||||
Name[es]=Gestión de Waydroid
|
||||
|
|
@ -12,10 +13,12 @@ Name[nl]=Waydroid-beheer
|
|||
Name[sl]=Upravljanje Waydroid
|
||||
Name[uk]=Керування Waydroid
|
||||
Name[x-test]=xxWaydroid Managementxx
|
||||
Name[zh_CN]=Waydroid 管理
|
||||
Icon=color
|
||||
|
||||
[org.kde.plasma.mobileshell.waydroidhelper.initialize]
|
||||
Name=Initialize Waydroid
|
||||
Name[ar]=تمهيد ويدرويد
|
||||
Name[ca]=Inicialitza el Waydroid
|
||||
Name[ca@valencia]=Restablix Waydroid
|
||||
Name[es]=Inicializar Waydroid
|
||||
|
|
@ -25,7 +28,9 @@ Name[nl]=Waydroid initialiseren
|
|||
Name[sl]=Inicializiraj Waydroid
|
||||
Name[uk]=Ініціалізувати Waydroid
|
||||
Name[x-test]=xxInitialize Waydroidxx
|
||||
Name[zh_CN]=初始化 Waydroid
|
||||
Description=Allow initialization of Waydroid
|
||||
Description[ar]=السماح بتمهيد ويدرويد
|
||||
Description[ca]=Permet la inicialització del Waydroid
|
||||
Description[ca@valencia]=Permet la inicialització de Waydroid
|
||||
Description[es]=Permitir la inicialización de Waydroid
|
||||
|
|
@ -35,6 +40,7 @@ Description[nl]=Initialisatie van Waydroid toestaan
|
|||
Description[sl]=Dovoli inicializacijo Waydroida
|
||||
Description[uk]=Дозволити ініціалізацію Waydroid
|
||||
Description[x-test]=xxAllow initialization of Waydroidxx
|
||||
Description[zh_CN]=允许初始化 Waydroid
|
||||
Policy=yes
|
||||
PolicyInactive=yes
|
||||
Persistence=session
|
||||
|
|
|
|||
|
|
@ -18,13 +18,27 @@
|
|||
}
|
||||
],
|
||||
"Description": "Waydroid quick setting for Plasma Mobile",
|
||||
"Description[ca@valencia]": "Configuració ràpida de Waydroid per a Plasma Mobile",
|
||||
"Description[ca]": "Configuració ràpida del Waydroid per al Plasma Mobile",
|
||||
"Description[es]": "Ajuste rápido de Waydroid para Plasma Mobile",
|
||||
"Description[he]": "הגדרה מהירה ל־Waydroid לפלזמה לניידים",
|
||||
"Description[ka]": "Waydroid-ის სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის",
|
||||
"Description[nl]": "Waydroid snelle instelling van audio voor Plasma Mobile",
|
||||
"Description[sl]": "Hitre nastavitve za Plasma Mobile",
|
||||
"Description[uk]": "Швидке налаштовування Waydroid для Мобільної Плазми",
|
||||
"Description[x-test]": "xxWaydroid quick setting for Plasma Mobilexx",
|
||||
"Icon": "folder-android-symbolic",
|
||||
"Id": "org.kde.plasma.quicksetting.waydroid",
|
||||
"License": "GPL-2.0+",
|
||||
"Name": "Waydroid",
|
||||
"Name[ca@valencia]": "Waydroid",
|
||||
"Name[ca]": "Waydroid",
|
||||
"Name[es]": "Waydroid",
|
||||
"Name[he]": "Waydroid",
|
||||
"Name[ka]": "Waydroid",
|
||||
"Name[nl]": "Waydroid",
|
||||
"Name[sl]": "Waydroid",
|
||||
"Name[uk]": "Waydroid",
|
||||
"Name[x-test]": "xxWaydroidxx",
|
||||
"Website": "https://kde.org"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue