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-23 01:35:20 +00:00
parent 5fda0be9c4
commit b4ab75c971
2 changed files with 7 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

@ -8,6 +8,7 @@
"Name[ca@valencia]": "Florian RICHER",
"Name[ca]": "Florian RICHER",
"Name[es]": "Florian RICHER",
"Name[fr]": "Florian RICHER",
"Name[he]": "פלוריאן רישה",
"Name[it]": "Florian RICHER",
"Name[ka]": "Florian RICHER",
@ -26,6 +27,7 @@
"Description[ca@valencia]": "Configureu Waydroid",
"Description[ca]": "Configuració del Waydroid",
"Description[es]": "Configuración de Waydroid",
"Description[fr]": "Configuration de Waydroid",
"Description[he]": "הגדרות Waydroid",
"Description[it]": "Configurazione di Waydroid",
"Description[ka]": "Waydroid-ის მორგება",
@ -50,6 +52,7 @@
"Name[ca@valencia]": "Integració de Waydroid",
"Name[ca]": "Integració del Waydroid",
"Name[es]": "Integración con Waydroid",
"Name[fr]": "Intégration de Waydroid",
"Name[he]": "שילוב מול Waydroid",
"Name[it]": "Integrazione Waydroid",
"Name[ka]": "ინტეგრაცია Waydroid-თან",
@ -67,6 +70,7 @@
"X-KDE-Keywords[ca@valencia]": "waydroid",
"X-KDE-Keywords[ca]": "waydroid",
"X-KDE-Keywords[es]": "waydroid",
"X-KDE-Keywords[fr]": "waydroid",
"X-KDE-Keywords[he]": "waydroid",
"X-KDE-Keywords[it]": "waydroid",
"X-KDE-Keywords[ka]": "waydroid",

3
quicksettings/waydroid/metadata.json
View file

@ -9,6 +9,7 @@
"Name[ca@valencia]": "Florian RICHER",
"Name[ca]": "Florian RICHER",
"Name[es]": "Florian RICHER",
"Name[fr]": "Florian RICHER",
"Name[he]": "פלוריאן רישה",
"Name[it]": "Florian RICHER",
"Name[ka]": "Florian RICHER",
@ -26,6 +27,7 @@
"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[fr]": "Configuration rapide de Waydroid pour Plasma Mobile",
"Description[he]": "הגדרה מהירה ל־Waydroid לפלזמה לניידים",
"Description[it]": "Impostazioni rapide di Waydroid per Plasma Mobile",
"Description[ka]": "Waydroid-ის სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის",
@ -44,6 +46,7 @@
"Name[ca@valencia]": "Waydroid",
"Name[ca]": "Waydroid",
"Name[es]": "Waydroid",
"Name[fr]": "Waydroid",
"Name[he]": "Waydroid",
"Name[it]": "Waydroid",
"Name[ka]": "Waydroid",