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-08-02 01:34:55 +00:00
parent 73302205b1
commit 055396e133
2 changed files with 5 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

@ -9,6 +9,7 @@
"Name[ca]": "Florian RICHER",
"Name[es]": "Florian RICHER",
"Name[eu]": "Florian RICHER",
"Name[fi]": "Florian RICHER",
"Name[fr]": "Florian RICHER",
"Name[he]": "פלוריאן רישה",
"Name[it]": "Florian RICHER",
@ -30,6 +31,7 @@
"Description[ca]": "Configuració del Waydroid",
"Description[es]": "Configuración de Waydroid",
"Description[eu]": "Waydroid konfigurazioa",
"Description[fi]": "Waydroid-asetukset",
"Description[fr]": "Configuration de Waydroid",
"Description[he]": "הגדרות Waydroid",
"Description[it]": "Configurazione di Waydroid",
@ -57,6 +59,7 @@
"Name[ca]": "Integració del Waydroid",
"Name[es]": "Integración con Waydroid",
"Name[eu]": "Waydroid bateratzea",
"Name[fi]": "Waydroid-eheytys",
"Name[fr]": "Intégration de Waydroid",
"Name[he]": "שילוב מול Waydroid",
"Name[it]": "Integrazione Waydroid",
@ -77,6 +80,7 @@
"X-KDE-Keywords[ca]": "waydroid",
"X-KDE-Keywords[es]": "waydroid",
"X-KDE-Keywords[eu]": "waydroid",
"X-KDE-Keywords[fi]": "waydroid",
"X-KDE-Keywords[fr]": "waydroid",
"X-KDE-Keywords[he]": "waydroid",
"X-KDE-Keywords[it]": "waydroid",

1
quicksettings/waydroid/metadata.json
View file

@ -10,6 +10,7 @@
"Name[ca]": "Florian RICHER",
"Name[es]": "Florian RICHER",
"Name[eu]": "Florian RICHER",
"Name[fi]": "Florian RICHER",
"Name[fr]": "Florian RICHER",
"Name[he]": "פלוריאן רישה",
"Name[it]": "Florian RICHER",