marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03: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-01 01:36:35 +00:00
parent 09ae09d34a
commit af8460c208
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/waydroidintegrationplugin/kauth/waydroidhelper.actions
View file

@ -8,6 +8,7 @@ Name[ca]=Gestió del Waydroid
Name[ca@valencia]=Gestioneu Waydroid
Name[es]=Gestión de Waydroid
Name[eu]=Waydroid kudeaketa
Name[fi]=Waydroidin hallinnointi
Name[fr]=Gestion de Waydroid
Name[he]=ניהול Waydroid
Name[it]=Gestione di Waydroid
@ -29,6 +30,7 @@ Name[ca]=Inicialitza el Waydroid
Name[ca@valencia]=Restablix Waydroid
Name[es]=Inicializar Waydroid
Name[eu]=Hasieratu Waydroid
Name[fi]=Valmistele Waydroid
Name[fr]=Initialiser Waydroid
Name[he]=אתחול Waydroid
Name[it]=Inizializza Waydroid
@ -47,6 +49,7 @@ Description[ca]=Permet la inicialització del Waydroid
Description[ca@valencia]=Permet la inicialització de Waydroid
Description[es]=Permitir la inicialización de Waydroid
Description[eu]=Waydroid hasieratzeko aukera eskaintzen du
Description[fi]=Salli Waydroidin valmistelu
Description[fr]=Autoriser l'initialisation de Waydroid
Description[he]=לאפשר אתחול של Waydroid
Description[it]=Permetti l'inizializzazione di Waydroid

1
quicksettings/flashlight/kauth/flashlighthelper.actions
View file

@ -8,6 +8,7 @@ Name[ca]=Gestió del Waydroid
Name[ca@valencia]=Gestioneu Waydroid
Name[es]=Gestión de Waydroid
Name[eu]=Waydroid kudeaketa
Name[fi]=Waydroidin hallinnointi
Name[fr]=Gestion de Waydroid
Name[he]=ניהול Waydroid
Name[it]=Gestione di Waydroid