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 2025-07-14 01:35:30 +00:00
parent c2457af2d9
commit 32262a9bc3
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcms/waydroidintegration/kcm_waydroidintegration.json
View file

@ -4,6 +4,7 @@
{ {
"Email": "florian.richer@protonmail.com", "Email": "florian.richer@protonmail.com",
"Name": "Florian RICHER", "Name": "Florian RICHER",
"Name[ca@valencia]": "Florian RICHER",
"Name[ca]": "Florian RICHER", "Name[ca]": "Florian RICHER",
"Name[es]": "Florian RICHER", "Name[es]": "Florian RICHER",
"Name[he]": "פלוריאן רישה", "Name[he]": "פלוריאן רישה",
@ -17,6 +18,7 @@
], ],
"Category": "Waydroid Integration", "Category": "Waydroid Integration",
"Description": "Waydroid configuration", "Description": "Waydroid configuration",
"Description[ca@valencia]": "Configureu Waydroid",
"Description[ca]": "Configuració del Waydroid", "Description[ca]": "Configuració del Waydroid",
"Description[es]": "Configuración de Waydroid", "Description[es]": "Configuración de Waydroid",
"Description[he]": "הגדרות Waydroid", "Description[he]": "הגדרות Waydroid",
@ -36,6 +38,7 @@
"Icon": "folder-android-symbolic", "Icon": "folder-android-symbolic",
"License": "GPL", "License": "GPL",
"Name": "Waydroid Integration", "Name": "Waydroid Integration",
"Name[ca@valencia]": "Integració de Waydroid",
"Name[ca]": "Integració del Waydroid", "Name[ca]": "Integració del Waydroid",
"Name[es]": "Integración con Waydroid", "Name[es]": "Integración con Waydroid",
"Name[he]": "שילוב מול Waydroid", "Name[he]": "שילוב מול Waydroid",
@ -48,6 +51,7 @@
"Website": "https://plasma-mobile.org/" "Website": "https://plasma-mobile.org/"
}, },
"X-KDE-Keywords": "waydroid", "X-KDE-Keywords": "waydroid",
"X-KDE-Keywords[ca@valencia]": "waydroid",
"X-KDE-Keywords[ca]": "waydroid", "X-KDE-Keywords[ca]": "waydroid",
"X-KDE-Keywords[es]": "waydroid", "X-KDE-Keywords[es]": "waydroid",
"X-KDE-Keywords[he]": "waydroid", "X-KDE-Keywords[he]": "waydroid",

5
quicksettings/waydroid/metadata.json
View file

@ -5,6 +5,7 @@
{ {
"Email": "florian.richer@protonmail.com", "Email": "florian.richer@protonmail.com",
"Name": "Florian RICHER", "Name": "Florian RICHER",
"Name[ca@valencia]": "Florian RICHER",
"Name[ca]": "Florian RICHER", "Name[ca]": "Florian RICHER",
"Name[es]": "Florian RICHER", "Name[es]": "Florian RICHER",
"Name[he]": "פלוריאן רישה", "Name[he]": "פלוריאן רישה",
@ -17,10 +18,14 @@
} }
], ],
"Description": "Waydroid quick setting for Plasma Mobile", "Description": "Waydroid quick setting for Plasma Mobile",
"Description[ka]": "Waydroid-ის სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის",
"Description[x-test]": "xxWaydroid quick setting for Plasma Mobilexx",
"Icon": "folder-android-symbolic", "Icon": "folder-android-symbolic",
"Id": "org.kde.plasma.quicksetting.waydroid", "Id": "org.kde.plasma.quicksetting.waydroid",
"License": "GPL-2.0+", "License": "GPL-2.0+",
"Name": "Waydroid", "Name": "Waydroid",
"Name[ka]": "Waydroid",
"Name[x-test]": "xxWaydroidxx",
"Website": "https://kde.org" "Website": "https://kde.org"
} }
} }